[SCM] Debian package checker branch, master, updated. 2.4.3-101-gd541afb
The following commit has been merged in the master branch:
commit d541afbc70e5509d7264f5fe4b9dcf0d47837da5
Author: Niels Thykier <niels@thykier.net>
Date: Sun Jan 2 12:29:47 2011 +0100
Check for ldconfig in pre{inst,rm}.
diff --git a/t/COVERAGE b/t/COVERAGE
index 371d56d..f51ff29 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -164,8 +164,6 @@ shared-libs non-dev-pkg-with-shlib-symlink
shared-libs pkg-has-shlibs-control-file-but-no-actual-shared-libs
shared-libs postinst-has-useless-call-to-ldconfig
shared-libs postrm-unsafe-ldconfig
-shared-libs preinst-calls-ldconfig
-shared-libs prerm-calls-ldconfig
shared-libs shlib-calls-exit
shared-libs shlib-with-bad-permissions
shared-libs shlib-with-executable-stack
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/Makefile b/t/tests/shared-libs-ldconfig-scripts/debian/Makefile
index 12ca9bd..fca7af6 100644
--- a/t/tests/shared-libs-ldconfig-scripts/debian/Makefile
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/Makefile
@@ -1,7 +1,7 @@
CC=gcc
CFLAGS=-Wall -Winline -O2 -fPIC
-SONAMES:= libfoo.so.1
+SONAMES:= libfoo.so.1 libfish.so.1
LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
all: $(LIBFILES)
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
index 002aa20..35d97c4 100644
--- a/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
@@ -14,3 +14,13 @@ Description: {$description} (missing ldc)
things. It should not be installed like a regular package.
.
Checks for missing ldconfig in scripts.
+
+Package: libfish1
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (preinst/rm ldc)
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package.
+ .
+ Checks for ldconfig in preinst/prerm scripts.
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.install b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.install
new file mode 100644
index 0000000..b1c4ec9
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.install
@@ -0,0 +1 @@
+usr/lib/libfish*
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.preinst b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.preinst
new file mode 100755
index 0000000..3e67b7e
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.preinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+ldconfig
+
+#DEBHELPER#
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.prerm b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.prerm
new file mode 100755
index 0000000..3e67b7e
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.prerm
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+ldconfig
+
+#DEBHELPER#
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.symbols b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.symbols
new file mode 100644
index 0000000..2c5a075
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfish1.symbols
@@ -0,0 +1,3 @@
+libfish.so.1 libfish1 #MINVER#
+ e@Base 1.0
+ energy@Base 0.9
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.install
similarity index 100%
copy from t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install
copy to t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.install
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/postinst b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.postinst
similarity index 100%
rename from t/tests/shared-libs-ldconfig-scripts/debian/debian/postinst
rename to t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.postinst
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/postrm b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.postrm
similarity index 100%
rename from t/tests/shared-libs-ldconfig-scripts/debian/debian/postrm
rename to t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.postrm
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/symbols b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.symbols
similarity index 100%
rename from t/tests/shared-libs-ldconfig-scripts/debian/debian/symbols
rename to t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.symbols
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules b/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
index 077e088..ba9524f 100755
--- a/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
@@ -4,5 +4,12 @@
dh $@
override_dh_builddeb:
- cp -af debian/postrm debian/postinst debian/libfoo1/DEBIAN/
+ for P in $$(dh_listpackages) ; do \
+ for S in postinst postrm preinst prerm ; do \
+ if [ -f debian/$${P}.$${S} ] ; then \
+ cp -af debian/$${P}.$${S} debian/$${P}/DEBIAN/$${S} ; \
+ chmod 0755 debian/$${P}/DEBIAN/$${S} ; \
+ fi ; \
+ done ; \
+ done
dh_builddeb
diff --git a/t/tests/shared-libs-ldconfig-scripts/desc b/t/tests/shared-libs-ldconfig-scripts/desc
index 2cbadaa..2516b0d 100644
--- a/t/tests/shared-libs-ldconfig-scripts/desc
+++ b/t/tests/shared-libs-ldconfig-scripts/desc
@@ -5,3 +5,5 @@ Description: Test checks related to ldconfig in scripts
Test-For:
postinst-must-call-ldconfig
postrm-should-call-ldconfig
+ preinst-calls-ldconfig
+ prerm-calls-ldconfig
diff --git a/t/tests/shared-libs-ldconfig-scripts/tags b/t/tests/shared-libs-ldconfig-scripts/tags
index 6e69fa7..6e65891 100644
--- a/t/tests/shared-libs-ldconfig-scripts/tags
+++ b/t/tests/shared-libs-ldconfig-scripts/tags
@@ -1,2 +1,4 @@
E: libfoo1: postinst-must-call-ldconfig usr/lib/libfoo.so.1.0.1
E: libfoo1: postrm-should-call-ldconfig usr/lib/libfoo.so.1.0.1
+W: libfish1: preinst-calls-ldconfig
+W: libfish1: prerm-calls-ldconfig
--
Debian package checker
Reply to: