diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2023-12-19 02:49:06 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2023-12-19 14:18:57 +0100 |
commit | 6729c27b67c99cdbdf5f78f4a557422fc716c085 (patch) | |
tree | c392de0d4bdf09d0fd1c2010f5a50e856960e732 /dilos/core | |
parent | 6bc6d6e3f42e6a5d04aede27066aa168e8b7ebe9 (diff) | |
download | tde-packaging-6729c27b67c99cdbdf5f78f4a557422fc716c085.tar.gz tde-packaging-6729c27b67c99cdbdf5f78f4a557422fc716c085.zip |
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 <slavek.banko@axis.cz>
(cherry picked from commit 34145f8176dbda8170684ae8fcdea0787a904f66)
Diffstat (limited to 'dilos/core')
53 files changed, 85 insertions, 254 deletions
diff --git a/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeaccessibility/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/tdeaddons/debian/cdbs/debian-tde.mk b/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeaddons/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/tdeaddons/debian/kicker-applets-trinity.lintian b/dilos/core/tdeaddons/debian/kicker-applets-trinity.lintian deleted file mode 100644 index 705d74139..000000000 --- a/dilos/core/tdeaddons/debian/kicker-applets-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -# Call is inserted by debhelper and is correct. -kicker-applets-trinity: postinst-has-useless-call-to-ldconfig -kicker-applets-trinity: postrm-has-useless-call-to-ldconfig diff --git a/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk b/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeadmin/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/tdeartwork/debian/cdbs/debian-tde.mk b/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeartwork/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/tdebase/debian/cdbs/debian-tde.mk b/dilos/core/tdebase/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdebase/debian/cdbs/debian-tde.mk +++ b/dilos/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)/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/tdebase/debian/kdesktop-trinity.postinst b/dilos/core/tdebase/debian/kdesktop-trinity.postinst deleted file mode 100644 index 65da715e5..000000000 --- a/dilos/core/tdebase/debian/kdesktop-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kdesktop-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/khelpcenter-trinity.lintian b/dilos/core/tdebase/debian/khelpcenter-trinity.lintian index 4266f0f44..a45804dd0 100644 --- a/dilos/core/tdebase/debian/khelpcenter-trinity.lintian +++ b/dilos/core/tdebase/debian/khelpcenter-trinity.lintian @@ -1,3 +1 @@ khelpcenter-trinity: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so diff --git a/dilos/core/tdebase/debian/khelpcenter-trinity.postinst b/dilos/core/tdebase/debian/khelpcenter-trinity.postinst deleted file mode 100644 index 4a906880c..000000000 --- a/dilos/core/tdebase/debian/khelpcenter-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for khelpcenter-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/klipper-trinity.lintian b/dilos/core/tdebase/debian/klipper-trinity.lintian index 4aacfafd0..8c37b9b6e 100644 --- a/dilos/core/tdebase/debian/klipper-trinity.lintian +++ b/dilos/core/tdebase/debian/klipper-trinity.lintian @@ -1,3 +1 @@ klipper-trinity: no-shlibs-control-file usr/lib/libtdeinit_klipper.so -klipper-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so -klipper-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so diff --git a/dilos/core/tdebase/debian/klipper-trinity.postinst b/dilos/core/tdebase/debian/klipper-trinity.postinst deleted file mode 100644 index adf32323b..000000000 --- a/dilos/core/tdebase/debian/klipper-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for klipper-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/kmenuedit-trinity.lintian b/dilos/core/tdebase/debian/kmenuedit-trinity.lintian index f085ffc8c..d3b412257 100644 --- a/dilos/core/tdebase/debian/kmenuedit-trinity.lintian +++ b/dilos/core/tdebase/debian/kmenuedit-trinity.lintian @@ -1,4 +1,2 @@ kmenuedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so kmenuedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so -kmenuedit-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so -kmenuedit-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so diff --git a/dilos/core/tdebase/debian/kmenuedit-trinity.postinst b/dilos/core/tdebase/debian/kmenuedit-trinity.postinst deleted file mode 100644 index 29bc5b6b5..000000000 --- a/dilos/core/tdebase/debian/kmenuedit-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kmenuedit-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/konsole-trinity.lintian b/dilos/core/tdebase/debian/konsole-trinity.lintian index 6a55d9e64..218aec8fe 100644 --- a/dilos/core/tdebase/debian/konsole-trinity.lintian +++ b/dilos/core/tdebase/debian/konsole-trinity.lintian @@ -1,3 +1 @@ konsole-trinity: no-shlibs-control-file usr/lib/libtdeinit_konsole.so -konsole-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so -konsole-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so diff --git a/dilos/core/tdebase/debian/konsole-trinity.postinst b/dilos/core/tdebase/debian/konsole-trinity.postinst index 6e38c4939..dc2328977 100644 --- a/dilos/core/tdebase/debian/konsole-trinity.postinst +++ b/dilos/core/tdebase/debian/konsole-trinity.postinst @@ -24,9 +24,6 @@ case "$1" in configure) update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/bin/konsole 35 \ --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /usr/share/man/man1/konsole.1 - - # force ldconfig due to tdeinit library -# ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.lintian b/dilos/core/tdebase/debian/ksmserver-trinity.lintian index a6dfd1fe6..2126fe400 100644 --- a/dilos/core/tdebase/debian/ksmserver-trinity.lintian +++ b/dilos/core/tdebase/debian/ksmserver-trinity.lintian @@ -1,2 +1 @@ ksmserver-trinity: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so -ksmserver-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.postinst b/dilos/core/tdebase/debian/ksmserver-trinity.postinst index f4b160056..e40921e73 100644 --- a/dilos/core/tdebase/debian/ksmserver-trinity.postinst +++ b/dilos/core/tdebase/debian/ksmserver-trinity.postinst @@ -26,9 +26,6 @@ case "$1" in x-session-manager /usr/bin/starttde 40 \ --slave /usr/share/man/man1/x-session-manager.1 \ x-session-manager.1 "/usr/share/man/man1/starttde.1" - - # force ldconfig due to tdeinit library -# ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian b/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian index f24713727..24f59f525 100644 --- a/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian +++ b/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian @@ -5,5 +5,3 @@ tdebase-bin-trinity: setuid-binary usr/bin/tdmtsak 4711 root/root tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so -tdebase-bin-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so -tdebase-bin-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so diff --git a/dilos/core/tdebase/debian/tdeprint-trinity.lintian b/dilos/core/tdebase/debian/tdeprint-trinity.lintian index 79ef87ff2..99109cc72 100644 --- a/dilos/core/tdebase/debian/tdeprint-trinity.lintian +++ b/dilos/core/tdebase/debian/tdeprint-trinity.lintian @@ -1,4 +1,2 @@ tdeprint-trinity: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so tdeprint-trinity: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so -tdeprint-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so -tdeprint-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so diff --git a/dilos/core/tdebase/debian/tdeprint-trinity.postinst b/dilos/core/tdebase/debian/tdeprint-trinity.postinst deleted file mode 100644 index a2fa0876f..000000000 --- a/dilos/core/tdebase/debian/tdeprint-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for tdeprint-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebindings/debian/cdbs/debian-tde.mk b/dilos/core/tdebindings/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdebindings/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdebindings/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/tdeedu/debian/cdbs/debian-tde.mk b/dilos/core/tdeedu/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdeedu/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeedu/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/tdegames/debian/cdbs/debian-tde.mk b/dilos/core/tdegames/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdegames/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdegames/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/tdegraphics/debian/cdbs/debian-tde.mk b/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdegraphics/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/tdegraphics/debian/kfaxview-trinity.lintian b/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian index 5bcc6c252..37dda0ca2 100644 --- a/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian +++ b/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian @@ -1,4 +1,2 @@ kfaxview-trinity: no-shlibs-control-file usr/lib/libkfaximage.so -kfaxview-trinity: postinst-must-call-ldconfig usr/lib/libkfaximage.so -kfaxview-trinity: postrm-should-call-ldconfig usr/lib/libkfaximage.so kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage diff --git a/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian b/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian index 1d80f308d..a1f267411 100644 --- a/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian +++ b/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian @@ -1,4 +1,2 @@ kuickshow-trinity: no-shlibs-control-file usr/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kuickshow.so kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow diff --git a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk b/dilos/core/tdelibs/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdelibs/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/tdelibs/debian/tdelibs-data-trinity.postinst b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst index 6a6af3c3f..8c563a3d2 100644 --- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst +++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst @@ -11,7 +11,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in upgrade|install) -# ldconfig ;; abort-upgrade) diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm index 5b639eb3e..40c135b0c 100644 --- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm +++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm @@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in remove) -# ldconfig ;; abort-upgrade) diff --git a/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk b/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdemultimedia/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/tdemultimedia/debian/kmix-trinity.lintian b/dilos/core/tdemultimedia/debian/kmix-trinity.lintian index fa69f2d18..42b01cd6a 100644 --- a/dilos/core/tdemultimedia/debian/kmix-trinity.lintian +++ b/dilos/core/tdemultimedia/debian/kmix-trinity.lintian @@ -1,4 +1,2 @@ kmix-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_kmixctrl.so kmix-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_kmix.so -kmix-trinity: postinst-must-call-ldconfig usr/lib/*/libtdeinit_kmixctrl.so -kmix-trinity: postrm-should-call-ldconfig usr/lib/*/libtdeinit_kmixctrl.so diff --git a/dilos/core/tdemultimedia/debian/krec-trinity.lintian b/dilos/core/tdemultimedia/debian/krec-trinity.lintian index fdb934927..81041e36d 100644 --- a/dilos/core/tdemultimedia/debian/krec-trinity.lintian +++ b/dilos/core/tdemultimedia/debian/krec-trinity.lintian @@ -1,3 +1 @@ krec-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_krec.so -krec-trinity: postinst-must-call-ldconfig usr/lib/*/libtdeinit_krec.so -krec-trinity: postrm-should-call-ldconfig usr/lib/*/libtdeinit_krec.so diff --git a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk b/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdenetwork/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/tdenetwork/debian/kdict-trinity.postinst b/dilos/core/tdenetwork/debian/kdict-trinity.postinst deleted file mode 100644 index 055be2e09..000000000 --- a/dilos/core/tdenetwork/debian/kdict-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kdict-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdenetwork/debian/ksirc-trinity.lintian b/dilos/core/tdenetwork/debian/ksirc-trinity.lintian index 58fe394fa..3014f3461 100644 --- a/dilos/core/tdenetwork/debian/ksirc-trinity.lintian +++ b/dilos/core/tdenetwork/debian/ksirc-trinity.lintian @@ -1,3 +1 @@ ksirc-trinity: no-shlibs-control-file usr/lib/libtdeinit_ksirc.so -ksirc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ksirc.so -ksirc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_ksirc.so diff --git a/dilos/core/tdenetwork/debian/ksirc-trinity.postinst b/dilos/core/tdenetwork/debian/ksirc-trinity.postinst deleted file mode 100644 index 2c76ed8a9..000000000 --- a/dilos/core/tdenetwork/debian/ksirc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for ksirc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian b/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian index 7f5348940..0e6408ff4 100644 --- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian +++ b/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian @@ -1,3 +1 @@ kwifimanager-trinity: no-shlibs-control-file usr/lib/libkwireless.so -kwifimanager-trinity: postinst-must-call-ldconfig usr/lib/libkwireless.so -kwifimanager-trinity: postrm-should-call-ldconfig usr/lib/libkwireless.so diff --git a/dilos/core/tdepim/debian/cdbs/debian-tde.mk b/dilos/core/tdepim/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdepim/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdepim/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/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 diff --git a/dilos/core/tdetoys/debian/cdbs/debian-tde.mk b/dilos/core/tdetoys/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdetoys/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/tdetoys/debian/kweather-trinity.postinst b/dilos/core/tdetoys/debian/kweather-trinity.postinst deleted file mode 100644 index bf30c75a9..000000000 --- a/dilos/core/tdetoys/debian/kweather-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kweather-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian b/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian index b104d2e5d..914337ec6 100644 --- a/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian +++ b/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian @@ -1,3 +1 @@ ark-trinity: no-shlibs-control-file usr/lib/libtdeinit_ark.so -ark-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ark.so -ark-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_ark.so diff --git a/dilos/core/tdeutils/debian/ark-trinity.postinst b/dilos/core/tdeutils/debian/ark-trinity.postinst deleted file mode 100644 index d314f31e7..000000000 --- a/dilos/core/tdeutils/debian/ark-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for ark-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/cdbs/debian-tde.mk b/dilos/core/tdeutils/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdeutils/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeutils/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/tdeutils/debian/kcalc-trinity-trinity.lintian b/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian index b08559540..c84b29ee9 100644 --- a/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian +++ b/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian @@ -1,3 +1 @@ kcalc-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcalc.so -kcalc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kcalc.so -kcalc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kcalc.so diff --git a/dilos/core/tdeutils/debian/kcalc-trinity.postinst b/dilos/core/tdeutils/debian/kcalc-trinity.postinst deleted file mode 100644 index e1935e9a5..000000000 --- a/dilos/core/tdeutils/debian/kcalc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kcalc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/kedit-trinity.lintian b/dilos/core/tdeutils/debian/kedit-trinity.lintian index da3ee87da..32491dbbb 100644 --- a/dilos/core/tdeutils/debian/kedit-trinity.lintian +++ b/dilos/core/tdeutils/debian/kedit-trinity.lintian @@ -1,3 +1 @@ kedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kedit.so -kedit-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kedit.so -kedit-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kedit.so diff --git a/dilos/core/tdeutils/debian/kedit-trinity.postinst b/dilos/core/tdeutils/debian/kedit-trinity.postinst deleted file mode 100644 index b939c5451..000000000 --- a/dilos/core/tdeutils/debian/kedit-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kedit-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/tdelirc-trinity.lintian b/dilos/core/tdeutils/debian/tdelirc-trinity.lintian index 00770eec1..3458103f8 100644 --- a/dilos/core/tdeutils/debian/tdelirc-trinity.lintian +++ b/dilos/core/tdeutils/debian/tdelirc-trinity.lintian @@ -1,3 +1 @@ tdelirc-trinity: no-shlibs-control-file usr/lib/libtdeinit_irkick.so -tdelirc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_irkick.so -tdelirc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_irkick.so diff --git a/dilos/core/tdeutils/debian/tdelirc-trinity.postinst b/dilos/core/tdeutils/debian/tdelirc-trinity.postinst deleted file mode 100644 index 423d9e98c..000000000 --- a/dilos/core/tdeutils/debian/tdelirc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for tdelirc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk b/dilos/core/tdevelop/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdevelop/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; \ |