summaryrefslogtreecommitdiffstats
path: root/dilos/core/tdebase/debian
diff options
context:
space:
mode:
Diffstat (limited to 'dilos/core/tdebase/debian')
-rw-r--r--dilos/core/tdebase/debian/cdbs/debian-tde.mk5
-rw-r--r--dilos/core/tdebase/debian/kdesktop-trinity.postinst16
-rw-r--r--dilos/core/tdebase/debian/khelpcenter-trinity.lintian2
-rw-r--r--dilos/core/tdebase/debian/khelpcenter-trinity.postinst16
-rw-r--r--dilos/core/tdebase/debian/klipper-trinity.lintian2
-rw-r--r--dilos/core/tdebase/debian/klipper-trinity.postinst16
-rw-r--r--dilos/core/tdebase/debian/kmenuedit-trinity.lintian2
-rw-r--r--dilos/core/tdebase/debian/kmenuedit-trinity.postinst16
-rw-r--r--dilos/core/tdebase/debian/konsole-trinity.lintian2
-rw-r--r--dilos/core/tdebase/debian/konsole-trinity.postinst3
-rw-r--r--dilos/core/tdebase/debian/ksmserver-trinity.lintian1
-rw-r--r--dilos/core/tdebase/debian/ksmserver-trinity.postinst3
-rw-r--r--dilos/core/tdebase/debian/tdebase-trinity-bin.lintian2
-rw-r--r--dilos/core/tdebase/debian/tdeprint-trinity.lintian2
-rw-r--r--dilos/core/tdebase/debian/tdeprint-trinity.postinst16
15 files changed, 5 insertions, 99 deletions
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