summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/applications/settings/tdenetworkmanager
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/applications/settings/tdenetworkmanager')
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk5
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian2
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst12
3 files changed, 5 insertions, 14 deletions
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
index b031e6981..aba508624 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/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/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..93aadf394 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
@@ -1,5 +1,3 @@
network-manager-tde: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdenetworkmanager.so
network-manager-tde: package-name-doesnt-match-sonames libtdeinit-tdenetworkmanager
-network-manager-tde: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdenetworkmanager.so
-network-manager-tde: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdenetworkmanager.so
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
deleted file mode 100644
index df7b9dba2..000000000
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# postinst script for network-manager-tde
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0