DEB: Automatically add ldconfig trigger if the package contains plugins.

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 <[email protected]>

15 files changed, 5 insertions, 84 deletions

diff --git a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk
index b031e6981..aba508624 100644
--- a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/core/tdebase/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)/opt/trinity/lib && \
+	   test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst
deleted file mode 100644
index 0b3eb0b52..000000000
--- a/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kdesktop-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian
index 3a278bff7..c57f28095 100644
--- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1 @@
 khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
-khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
-khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst
deleted file mode 100644
index b6b0656b7..000000000
--- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for khelpcenter-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian
index bee8b8020..c46e478c8 100644
--- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1 @@
 klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
-klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
-klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst b/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst
deleted file mode 100644
index b2c57de01..000000000
--- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for klipper-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian
index c36dd0445..f9d56b353 100644
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,2 @@
 kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
 kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
-kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
-kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst
deleted file mode 100644
index b3a79cc14..000000000
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kmenuedit-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian
index 7006dfe10..f0a12e1aa 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1 @@
 konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
-konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
-konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
index 532e028bd..3b7be1e92 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
+++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
@@ -21,9 +21,6 @@ case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
           --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /opt/trinity/share/man/man1/konsole.1
-
-        # force ldconfig due to tdeinit library
-        ldconfig
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian
index 2c7c61596..74b77ecf6 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1 @@
 ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
-ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
index 14e203a41..3b85196bb 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
@@ -23,9 +23,6 @@ case "$1" in
 	x-session-manager /opt/trinity/bin/starttde 40 \
 	--slave /usr/share/man/man1/x-session-manager.1 \
 	x-session-manager.1 "/opt/trinity/share/man/man1/starttde.1"
-
-        # force ldconfig due to tdeinit library
-        ldconfig
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
index 6501cf36b..ddaa5b274 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian
@@ -5,5 +5,3 @@ tdebase-bin-trinity: setuid-binary opt/trinity/bin/tdmtsak 4711 root/root
 tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
 tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
 tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
-tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
-tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian
index 52cd10d88..8410a13ae 100644
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian
+++ b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,2 @@
 tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
 tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
-tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
-tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst
deleted file mode 100644
index c812a9390..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for tdeprint-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-  # force ldconfig due to tdeinit library
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0