[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/02: t: Pre-emptively support ldconfig being triggered



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 59159883d7033fd9702281428815f9dfe63538b5
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Sep 10 21:52:55 2015 +0200

    t: Pre-emptively support ldconfig being triggered
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 t/tests/binaries-missing-depends-on-xapi/debian/debian/rules | 1 +
 t/tests/shared-libs-ldconfig-scripts/debian/debian/rules     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/t/tests/binaries-missing-depends-on-xapi/debian/debian/rules b/t/tests/binaries-missing-depends-on-xapi/debian/debian/rules
index edfce23..a59637d 100644
--- a/t/tests/binaries-missing-depends-on-xapi/debian/debian/rules
+++ b/t/tests/binaries-missing-depends-on-xapi/debian/debian/rules
@@ -8,5 +8,6 @@ override_dh_perl:
 override_dh_builddeb:
 	# Work around debhelper bug (triggers useless call to ldconfig)
 	rm -f debian/*/DEBIAN/postinst debian/*/DEBIAN/postrm
+	rm -f debian/*/DEBIAN/triggers
 	dh_builddeb
 
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules b/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
index 0d8a94b..1984f76 100755
--- a/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
@@ -13,4 +13,7 @@ override_dh_builddeb:
 	    fi ; \
 	  done ; \
 	done
+	# Work around debhelper adding triggers instead of explicit
+	# ldconfig calls
+	rm -f debian/libfoo1/DEBIAN/triggers
 	dh_builddeb

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: