diff options
Diffstat (limited to 'debian/_base/core')
54 files changed, 90 insertions, 219 deletions
diff --git a/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdeaddons/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian b/debian/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian deleted file mode 100644 index 705d74139..000000000 --- a/debian/_base/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/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdeadmin/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdeartwork/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk b/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdebase/debian/cdbs/debian-tde.mk +++ b/debian/_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/debian/_base/core/tdebase/debian/kdesktop-trinity.postinst b/debian/_base/core/tdebase/debian/kdesktop-trinity.postinst deleted file mode 100644 index 0b3eb0b52..000000000 --- a/debian/_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/debian/_base/core/tdebase/debian/khelpcenter-trinity.lintian b/debian/_base/core/tdebase/debian/khelpcenter-trinity.lintian index 3a278bff7..c57f28095 100644 --- a/debian/_base/core/tdebase/debian/khelpcenter-trinity.lintian +++ b/debian/_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/debian/_base/core/tdebase/debian/khelpcenter-trinity.postinst b/debian/_base/core/tdebase/debian/khelpcenter-trinity.postinst deleted file mode 100644 index b6b0656b7..000000000 --- a/debian/_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/debian/_base/core/tdebase/debian/klipper-trinity.lintian b/debian/_base/core/tdebase/debian/klipper-trinity.lintian index bee8b8020..c46e478c8 100644 --- a/debian/_base/core/tdebase/debian/klipper-trinity.lintian +++ b/debian/_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/debian/_base/core/tdebase/debian/klipper-trinity.postinst b/debian/_base/core/tdebase/debian/klipper-trinity.postinst deleted file mode 100644 index b2c57de01..000000000 --- a/debian/_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/debian/_base/core/tdebase/debian/kmenuedit-trinity.lintian b/debian/_base/core/tdebase/debian/kmenuedit-trinity.lintian index c36dd0445..f9d56b353 100644 --- a/debian/_base/core/tdebase/debian/kmenuedit-trinity.lintian +++ b/debian/_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/debian/_base/core/tdebase/debian/kmenuedit-trinity.postinst b/debian/_base/core/tdebase/debian/kmenuedit-trinity.postinst deleted file mode 100644 index b3a79cc14..000000000 --- a/debian/_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/debian/_base/core/tdebase/debian/konsole-trinity.lintian b/debian/_base/core/tdebase/debian/konsole-trinity.lintian index 7006dfe10..f0a12e1aa 100644 --- a/debian/_base/core/tdebase/debian/konsole-trinity.lintian +++ b/debian/_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/debian/_base/core/tdebase/debian/konsole-trinity.postinst b/debian/_base/core/tdebase/debian/konsole-trinity.postinst index 532e028bd..9191bdc69 100644 --- a/debian/_base/core/tdebase/debian/konsole-trinity.postinst +++ b/debian/_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) @@ -42,5 +39,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.lintian b/debian/_base/core/tdebase/debian/ksmserver-trinity.lintian index 2c7c61596..74b77ecf6 100644 --- a/debian/_base/core/tdebase/debian/ksmserver-trinity.lintian +++ b/debian/_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/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst b/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst index 14e203a41..48d90e182 100644 --- a/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst +++ b/debian/_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) @@ -44,5 +41,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.lintian b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.lintian index 6501cf36b..ddaa5b274 100644 --- a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.lintian +++ b/debian/_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/debian/_base/core/tdebase/debian/tdeprint-trinity.lintian b/debian/_base/core/tdebase/debian/tdeprint-trinity.lintian index 52cd10d88..8410a13ae 100644 --- a/debian/_base/core/tdebase/debian/tdeprint-trinity.lintian +++ b/debian/_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/debian/_base/core/tdebase/debian/tdeprint-trinity.postinst b/debian/_base/core/tdebase/debian/tdeprint-trinity.postinst deleted file mode 100644 index c812a9390..000000000 --- a/debian/_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 diff --git a/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk b/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdebindings/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdeedu/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk b/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdegames/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk b/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdegraphics/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian b/debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian index 77a1b0e8e..dbcda26a3 100644 --- a/debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian +++ b/debian/_base/core/tdegraphics/debian/kfaxview-trinity.lintian @@ -1,4 +1,2 @@ kfaxview-trinity: no-shlibs-control-file opt/trinity/lib/libkfaximage.so -kfaxview-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkfaximage.so -kfaxview-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkfaximage.so kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage diff --git a/debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian b/debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian index 89f453cea..121ed9a1b 100644 --- a/debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian +++ b/debian/_base/core/tdegraphics/debian/kuickshow-trinity.lintian @@ -1,4 +1,2 @@ kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow diff --git a/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst index f2a8d925b..99078621c 100644 --- a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst +++ b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst @@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in upgrade|install) - ldconfig ;; abort-upgrade) diff --git a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm index aae9f3600..40c135b0c 100644 --- a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm +++ b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm @@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in remove) - ldconfig ;; abort-upgrade) diff --git a/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk b/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian b/debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian index c802a5b07..914623090 100644 --- a/debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian +++ b/debian/_base/core/tdemultimedia/debian/kmix-trinity.lintian @@ -1,4 +1,2 @@ kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so -kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so -kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so diff --git a/debian/_base/core/tdemultimedia/debian/krec-trinity.lintian b/debian/_base/core/tdemultimedia/debian/krec-trinity.lintian index 9cba1f36a..e5e13fb57 100644 --- a/debian/_base/core/tdemultimedia/debian/krec-trinity.lintian +++ b/debian/_base/core/tdemultimedia/debian/krec-trinity.lintian @@ -1,3 +1 @@ krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so -krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so -krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so diff --git a/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk b/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdenetwork/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdenetwork/debian/kdict-trinity.postinst b/debian/_base/core/tdenetwork/debian/kdict-trinity.postinst deleted file mode 100644 index 5076ff321..000000000 --- a/debian/_base/core/tdenetwork/debian/kdict-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kdict-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian b/debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian index f219b1176..6cd864e57 100644 --- a/debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian +++ b/debian/_base/core/tdenetwork/debian/ksirc-trinity.lintian @@ -1,3 +1 @@ ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so -ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so -ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so diff --git a/debian/_base/core/tdenetwork/debian/ksirc-trinity.postinst b/debian/_base/core/tdenetwork/debian/ksirc-trinity.postinst deleted file mode 100644 index 1ee118baa..000000000 --- a/debian/_base/core/tdenetwork/debian/ksirc-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for ksirc-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian b/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian index 1586f0f0a..f85b1021c 100644 --- a/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian +++ b/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian @@ -1,3 +1 @@ kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so -kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so -kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so diff --git a/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk b/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdepim/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdesdk/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdesdk/debian/cervisia-trinity.lintian b/debian/_base/core/tdesdk/debian/cervisia-trinity.lintian index 6759ea297..189c5f2f2 100644 --- a/debian/_base/core/tdesdk/debian/cervisia-trinity.lintian +++ b/debian/_base/core/tdesdk/debian/cervisia-trinity.lintian @@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/ # This is from tdeinit black magic. cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so -cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so -cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia diff --git a/debian/_base/core/tdesdk/debian/cervisia-trinity.postinst b/debian/_base/core/tdesdk/debian/cervisia-trinity.postinst deleted file mode 100644 index 800a596bf..000000000 --- a/debian/_base/core/tdesdk/debian/cervisia-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for cervisia-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdetoys/debian/kweather-trinity.postinst b/debian/_base/core/tdetoys/debian/kweather-trinity.postinst deleted file mode 100644 index 99a084399..000000000 --- a/debian/_base/core/tdetoys/debian/kweather-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kweather-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian b/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian index 47861fafc..66bb7fec8 100644 --- a/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian +++ b/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian @@ -1,3 +1 @@ ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so -ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so -ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so diff --git a/debian/_base/core/tdeutils/debian/ark-trinity.postinst b/debian/_base/core/tdeutils/debian/ark-trinity.postinst deleted file mode 100644 index b919d035f..000000000 --- a/debian/_base/core/tdeutils/debian/ark-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for ark-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian index 0b36154e5..3c468628f 100644 --- a/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian +++ b/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian @@ -1,3 +1 @@ kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so -kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so -kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so diff --git a/debian/_base/core/tdeutils/debian/kcalc-trinity.postinst b/debian/_base/core/tdeutils/debian/kcalc-trinity.postinst deleted file mode 100644 index 6cf1c841c..000000000 --- a/debian/_base/core/tdeutils/debian/kcalc-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kcalc-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/_base/core/tdeutils/debian/kedit-trinity.lintian b/debian/_base/core/tdeutils/debian/kedit-trinity.lintian index fdde7bd3b..fbe5924d2 100644 --- a/debian/_base/core/tdeutils/debian/kedit-trinity.lintian +++ b/debian/_base/core/tdeutils/debian/kedit-trinity.lintian @@ -1,3 +1 @@ kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so -kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so -kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so diff --git a/debian/_base/core/tdeutils/debian/kedit-trinity.postinst b/debian/_base/core/tdeutils/debian/kedit-trinity.postinst deleted file mode 100644 index 1fa143a43..000000000 --- a/debian/_base/core/tdeutils/debian/kedit-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kedit-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian b/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian index 0c89583f3..666092455 100644 --- a/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian +++ b/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian @@ -1,3 +1 @@ tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst b/debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst deleted file mode 100644 index 9119d5017..000000000 --- a/debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for tdelirc-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk b/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdevelop/debian/cdbs/debian-tde.mk +++ b/debian/_base/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)/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/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk b/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/debian/_base/core/tdewebdev/debian/cdbs/debian-tde.mk +++ b/debian/_base/core/tdewebdev/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; \ |