summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/applications/settings/tdenetworkmanager/debian
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/applications/settings/tdenetworkmanager/debian')
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat2
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/control4
-rw-r--r--ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs1
-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
6 files changed, 10 insertions, 18 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 f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -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/compat b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
index 6ab8cc8fc..1c572b7d4 100644
--- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
@@ -2,8 +2,8 @@ Source: tdenetworkmanager-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt,
- cmake-trinity, ninja-build,
+Build-Depends: cdbs, debhelper (>= 10~), quilt,
+ tde-cmake, ninja-build,
tdelibs14-trinity-dev,
libiw-dev,
libnl-3-dev | libnl-dev (>= 1.1)
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs
@@ -0,0 +1 @@
+README.md
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