summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/core/tdeutils/debian
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/core/tdeutils/debian')
-rw-r--r--ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/core/tdeutils/debian/compat2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/control2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst13
-rw-r--r--ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst13
11 files changed, 8 insertions, 63 deletions
diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
index 47861fafc..66bb7fec8 100644
--- a/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst
deleted file mode 100644
index b919d035f..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/core/tdeutils/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/core/tdeutils/debian/compat b/ubuntu/_base/core/tdeutils/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/core/tdeutils/debian/compat
+++ b/ubuntu/_base/core/tdeutils/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/core/tdeutils/debian/control b/ubuntu/_base/core/tdeutils/debian/control
index 8044aaf01..0edc263b7 100644
--- a/ubuntu/_base/core/tdeutils/debian/control
+++ b/ubuntu/_base/core/tdeutils/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>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev | python-all-dev, libxtst-dev, xutils
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev, libxtst-dev, xutils
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
index 0b36154e5..3c468628f 100644
--- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst
deleted file mode 100644
index 6cf1c841c..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian
index fdde7bd3b..fbe5924d2 100644
--- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst
deleted file mode 100644
index 1fa143a43..000000000
--- a/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian
index 0c89583f3..666092455 100644
--- a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian
+++ b/ubuntu/_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/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst
deleted file mode 100644
index 9119d5017..000000000
--- a/ubuntu/_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