summaryrefslogtreecommitdiffstats
path: root/dilos/core/tdenetwork
diff options
context:
space:
mode:
Diffstat (limited to 'dilos/core/tdenetwork')
-rw-r--r--dilos/core/tdenetwork/debian/cdbs/debian-tde.mk7
-rw-r--r--dilos/core/tdenetwork/debian/compat2
-rw-r--r--dilos/core/tdenetwork/debian/control2
-rw-r--r--dilos/core/tdenetwork/debian/kdict-trinity.postinst16
-rw-r--r--dilos/core/tdenetwork/debian/ksirc-trinity.lintian2
-rw-r--r--dilos/core/tdenetwork/debian/ksirc-trinity.postinst16
-rw-r--r--dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian2
-rw-r--r--dilos/core/tdenetwork/debian/tdednssd-trinity.install7
8 files changed, 12 insertions, 42 deletions
diff --git a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk b/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk
index e2b1dc666..82994a844 100644
--- a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk
+++ b/dilos/core/tdenetwork/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)/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/compat b/dilos/core/tdenetwork/debian/compat
index ec635144f..f599e28b8 100644
--- a/dilos/core/tdenetwork/debian/compat
+++ b/dilos/core/tdenetwork/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/dilos/core/tdenetwork/debian/control b/dilos/core/tdenetwork/debian/control
index 5ee25cc13..cf58e92a1 100644
--- a/dilos/core/tdenetwork/debian/control
+++ b/dilos/core/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8) [!solaris-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64 !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8) [!solaris-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64 !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev
Standards-Version: 3.8.4
Package: tdenetwork-trinity
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/tdenetwork/debian/tdednssd-trinity.install b/dilos/core/tdenetwork/debian/tdednssd-trinity.install
index 6811c2701..e25b0c1d9 100644
--- a/dilos/core/tdenetwork/debian/tdednssd-trinity.install
+++ b/dilos/core/tdenetwork/debian/tdednssd-trinity.install
@@ -2,13 +2,14 @@ debian/tmp/usr/share/services/zeroconf.protocol
debian/tmp/usr/share/services/invitation.protocol
debian/tmp/usr/share/services/kded/dnssdwatcher.desktop
debian/tmp/usr/share/apps/remoteview/zeroconf.desktop
-debian/tmp/usr/share/apps/zeroconf/_http._tcp
debian/tmp/usr/share/apps/zeroconf/_ftp._tcp
+debian/tmp/usr/share/apps/zeroconf/_http._tcp
debian/tmp/usr/share/apps/zeroconf/_ldap._tcp
-debian/tmp/usr/share/apps/zeroconf/_webdav._tcp
debian/tmp/usr/share/apps/zeroconf/_nfs._tcp
-debian/tmp/usr/share/apps/zeroconf/_ssh._tcp
debian/tmp/usr/share/apps/zeroconf/_rfb._tcp
+debian/tmp/usr/share/apps/zeroconf/_ssh._tcp
+debian/tmp/usr/share/apps/zeroconf/_sftp-ssh._tcp
+debian/tmp/usr/share/apps/zeroconf/_webdav._tcp
debian/tmp/usr/lib/*/trinity/tdeio_zeroconf.so
debian/tmp/usr/lib/*/trinity/tdeio_zeroconf.la
debian/tmp/usr/lib/*/trinity/kded_dnssdwatcher.so