summaryrefslogtreecommitdiffstats
path: root/debian/_base/core/tdeutils
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2023-12-19 02:49:06 +0100
committerSlávek Banko <slavek.banko@axis.cz>2023-12-19 14:18:57 +0100
commit6729c27b67c99cdbdf5f78f4a557422fc716c085 (patch)
treec392de0d4bdf09d0fd1c2010f5a50e856960e732 /debian/_base/core/tdeutils
parent6bc6d6e3f42e6a5d04aede27066aa168e8b7ebe9 (diff)
downloadtde-packaging-6729c27b.tar.gz
tde-packaging-6729c27b.zip
DEB: Automatically add ldconfig trigger if the package contains plugins.
As a result, it is no longer necessary to enforce ldconfig in postinst and postrm scripts and this solves the problem with packages where the ldconfig was not called after installation, but it was needed. This resolves issue TDE/tdemultimedia#29. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 34145f8176dbda8170684ae8fcdea0787a904f66)
Diffstat (limited to 'debian/_base/core/tdeutils')
-rw-r--r--debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian2
-rw-r--r--debian/_base/core/tdeutils/debian/ark-trinity.postinst13
-rw-r--r--debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk5
-rw-r--r--debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian2
-rw-r--r--debian/_base/core/tdeutils/debian/kcalc-trinity.postinst13
-rw-r--r--debian/_base/core/tdeutils/debian/kedit-trinity.lintian2
-rw-r--r--debian/_base/core/tdeutils/debian/kedit-trinity.postinst13
-rw-r--r--debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian2
-rw-r--r--debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst13
9 files changed, 5 insertions, 60 deletions
diff --git a/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian b/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
index 47861fafc..66bb7fec8 100644
--- a/debian/_base/core/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/_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/debian/_base/core/tdeutils/debian/ark-trinity.postinst b/debian/_base/core/tdeutils/debian/ark-trinity.postinst
deleted file mode 100644
index b919d035f..000000000
--- a/debian/_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/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk
index b031e6981..aba508624 100644
--- a/debian/_base/core/tdeutils/debian/cdbs/debian-tde.mk
+++ b/debian/_base/core/tdeutils/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/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
index 0b36154e5..3c468628f 100644
--- a/debian/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/_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/debian/_base/core/tdeutils/debian/kcalc-trinity.postinst b/debian/_base/core/tdeutils/debian/kcalc-trinity.postinst
deleted file mode 100644
index 6cf1c841c..000000000
--- a/debian/_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/debian/_base/core/tdeutils/debian/kedit-trinity.lintian b/debian/_base/core/tdeutils/debian/kedit-trinity.lintian
index fdde7bd3b..fbe5924d2 100644
--- a/debian/_base/core/tdeutils/debian/kedit-trinity.lintian
+++ b/debian/_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/debian/_base/core/tdeutils/debian/kedit-trinity.postinst b/debian/_base/core/tdeutils/debian/kedit-trinity.postinst
deleted file mode 100644
index 1fa143a43..000000000
--- a/debian/_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/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian b/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian
index 0c89583f3..666092455 100644
--- a/debian/_base/core/tdeutils/debian/tdelirc-trinity.lintian
+++ b/debian/_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/debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst b/debian/_base/core/tdeutils/debian/tdelirc-trinity.postinst
deleted file mode 100644
index 9119d5017..000000000
--- a/debian/_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