From 34145f8176dbda8170684ae8fcdea0787a904f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 19 Dec 2023 02:49:06 +0100 Subject: DEB: Automatically add ldconfig trigger if the package contains plugins. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As a result, it is no longer necessary to enforce ldconfig in postinst and postrm scripts and this solves the problem with packages where the ldconfig was not called after installation, but it was needed. This resolves issue TDE/tdemultimedia#29. Signed-off-by: Slávek Banko --- dilos/core/tdesdk/debian/cdbs/debian-tde.mk | 5 +++++ dilos/core/tdesdk/debian/cervisia-trinity.lintian | 2 -- dilos/core/tdesdk/debian/cervisia-trinity.postinst | 16 ---------------- 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 dilos/core/tdesdk/debian/cervisia-trinity.postinst (limited to 'dilos/core/tdesdk') diff --git a/dilos/core/tdesdk/debian/cdbs/debian-tde.mk b/dilos/core/tdesdk/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdesdk/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdesdk/debian/cdbs/debian-tde.mk @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdesdk/debian/cervisia-trinity.lintian b/dilos/core/tdesdk/debian/cervisia-trinity.lintian index ff16fcf9e..76268d1ab 100644 --- a/dilos/core/tdesdk/debian/cervisia-trinity.lintian +++ b/dilos/core/tdesdk/debian/cervisia-trinity.lintian @@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./usr/share/apps/tdeconf_update/move_rep # This is from tdeinit black magic. cervisia-trinity: no-shlibs-control-file usr/lib/libtdeinit_cervisia.so -cervisia-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_cervisia.so -cervisia-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_cervisia.so cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia diff --git a/dilos/core/tdesdk/debian/cervisia-trinity.postinst b/dilos/core/tdesdk/debian/cervisia-trinity.postinst deleted file mode 100644 index 4728b399c..000000000 --- a/dilos/core/tdesdk/debian/cervisia-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for cervisia-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then -# # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 -- cgit v1.2.1