diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2023-12-19 02:49:06 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2023-12-19 03:05:04 +0100 |
| commit | 34145f8176dbda8170684ae8fcdea0787a904f66 (patch) | |
| tree | 2433ae5b037017b35b7a1f3a3eb41e13816923fe /ubuntu/_base/core/tdesdk | |
| parent | b73cc9eb4f7845482b7354719edb4e716f5d90c7 (diff) | |
| download | tde-packaging-34145f8176dbda8170684ae8fcdea0787a904f66.tar.gz tde-packaging-34145f8176dbda8170684ae8fcdea0787a904f66.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>
Diffstat (limited to 'ubuntu/_base/core/tdesdk')
| -rw-r--r-- | ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk | 5 | ||||
| -rw-r--r-- | ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian | 2 | ||||
| -rw-r--r-- | ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst | 13 |
3 files changed, 5 insertions, 15 deletions
diff --git a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk index b031e6981..aba508624 100644 --- a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdesdk/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/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian index 6759ea297..189c5f2f2 100644 --- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian +++ b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian @@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/ # This is from tdeinit black magic. cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so -cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so -cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia diff --git a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst deleted file mode 100644 index 800a596bf..000000000 --- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for cervisia-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 |