diff options
| author | Slávek Banko <[email protected]> | 2023-12-19 02:49:06 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2023-12-19 14:18:57 +0100 |
| commit | 6729c27b67c99cdbdf5f78f4a557422fc716c085 (patch) | |
| tree | c392de0d4bdf09d0fd1c2010f5a50e856960e732 /dilos/core/tdeutils/debian | |
| parent | 6bc6d6e3f42e6a5d04aede27066aa168e8b7ebe9 (diff) | |
| download | tde-packaging-6729c27b67c99cdbdf5f78f4a557422fc716c085.tar.gz tde-packaging-6729c27b67c99cdbdf5f78f4a557422fc716c085.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 <[email protected]>
(cherry picked from commit 34145f8176dbda8170684ae8fcdea0787a904f66)
Diffstat (limited to 'dilos/core/tdeutils/debian')
9 files changed, 5 insertions, 72 deletions
diff --git a/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian b/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian index b104d2e5d..914337ec6 100644 --- a/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian +++ b/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian @@ -1,3 +1 @@ ark-trinity: no-shlibs-control-file usr/lib/libtdeinit_ark.so -ark-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ark.so -ark-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_ark.so diff --git a/dilos/core/tdeutils/debian/ark-trinity.postinst b/dilos/core/tdeutils/debian/ark-trinity.postinst deleted file mode 100644 index d314f31e7..000000000 --- a/dilos/core/tdeutils/debian/ark-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for ark-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/tdeutils/debian/cdbs/debian-tde.mk b/dilos/core/tdeutils/debian/cdbs/debian-tde.mk index e219264f1..82994a844 100644 --- a/dilos/core/tdeutils/debian/cdbs/debian-tde.mk +++ b/dilos/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)/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/tdeutils/debian/kcalc-trinity-trinity.lintian b/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian index b08559540..c84b29ee9 100644 --- a/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian +++ b/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian @@ -1,3 +1 @@ kcalc-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcalc.so -kcalc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kcalc.so -kcalc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kcalc.so diff --git a/dilos/core/tdeutils/debian/kcalc-trinity.postinst b/dilos/core/tdeutils/debian/kcalc-trinity.postinst deleted file mode 100644 index e1935e9a5..000000000 --- a/dilos/core/tdeutils/debian/kcalc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kcalc-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/tdeutils/debian/kedit-trinity.lintian b/dilos/core/tdeutils/debian/kedit-trinity.lintian index da3ee87da..32491dbbb 100644 --- a/dilos/core/tdeutils/debian/kedit-trinity.lintian +++ b/dilos/core/tdeutils/debian/kedit-trinity.lintian @@ -1,3 +1 @@ kedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kedit.so -kedit-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kedit.so -kedit-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kedit.so diff --git a/dilos/core/tdeutils/debian/kedit-trinity.postinst b/dilos/core/tdeutils/debian/kedit-trinity.postinst deleted file mode 100644 index b939c5451..000000000 --- a/dilos/core/tdeutils/debian/kedit-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kedit-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/tdeutils/debian/tdelirc-trinity.lintian b/dilos/core/tdeutils/debian/tdelirc-trinity.lintian index 00770eec1..3458103f8 100644 --- a/dilos/core/tdeutils/debian/tdelirc-trinity.lintian +++ b/dilos/core/tdeutils/debian/tdelirc-trinity.lintian @@ -1,3 +1 @@ tdelirc-trinity: no-shlibs-control-file usr/lib/libtdeinit_irkick.so -tdelirc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_irkick.so -tdelirc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_irkick.so diff --git a/dilos/core/tdeutils/debian/tdelirc-trinity.postinst b/dilos/core/tdeutils/debian/tdelirc-trinity.postinst deleted file mode 100644 index 423d9e98c..000000000 --- a/dilos/core/tdeutils/debian/tdelirc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for tdelirc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 |