[SCM] Debian package checker branch, master, updated. 2.4.3-98-g2e84bd6
The following commit has been merged in the master branch:
commit 2e84bd674c2b91c814fbaed64c033b991d6d93bd
Author: Niels Thykier <niels@thykier.net>
Date: Sat Jan 1 22:11:47 2011 +0100
Test for duplicate entry in shlibs files.
diff --git a/t/COVERAGE b/t/COVERAGE
index 7dd5621..3a3fae6 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -357,7 +357,6 @@ scripts shell-script-fails-syntax-check
scripts suid-perl-script-but-no-perl-suid-dep
scripts update-alternatives-remove-called-in-postrm
-shared-libs duplicate-entry-in-shlibs-control-file
shared-libs duplicate-entry-in-symbols-control-file
shared-libs invalid-template-id-in-symbols-file
shared-libs ldconfig-symlink-missing-for-shlib
@@ -510,7 +509,6 @@ libbaz
control-file-has-bad-permissions
debian-changelog-file-is-a-symlink
debug-package-should-be-priority-extra
- duplicate-entry-in-shlibs-control-file
file-directly-in-usr-share-doc
ldconfig-symlink-missing-for-shlib
maintainer-shell-script-fails-syntax-check
diff --git a/t/tests/shared-libs-control-file/debian/Makefile b/t/tests/shared-libs-control-file/debian/Makefile
index 28999ff..e76a235 100644
--- a/t/tests/shared-libs-control-file/debian/Makefile
+++ b/t/tests/shared-libs-control-file/debian/Makefile
@@ -1,7 +1,8 @@
CC=gcc
CFLAGS=-Wall -Winline -O2 -fPIC
-SONAMES:= libnoshf.so.1 libeshf.so.1 libunshf.so.1 libfdshf.so.1
+SONAMES:= libnoshf.so.1 libeshf.so.1 libunshf.so.1 libfdshf.so.1 \
+ libdupshf.so.1
LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
all: $(LIBFILES)
diff --git a/t/tests/shared-libs-control-file/debian/debian/control.in b/t/tests/shared-libs-control-file/debian/debian/control.in
index fa03d58..4c40bf4 100644
--- a/t/tests/shared-libs-control-file/debian/debian/control.in
+++ b/t/tests/shared-libs-control-file/debian/debian/control.in
@@ -44,3 +44,13 @@ Description: {$description} (foreign dep)
things. It should not be installed like a regular package.
.
Checks for foreign dependency entry in shlibs file.
+
+Package: libdupshf1
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (dup entry)
+ 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 duplicate entry in shlibs file.
diff --git a/t/tests/shared-libs-control-file/debian/debian/libdupshf1.install b/t/tests/shared-libs-control-file/debian/debian/libdupshf1.install
new file mode 100644
index 0000000..7452fe1
--- /dev/null
+++ b/t/tests/shared-libs-control-file/debian/debian/libdupshf1.install
@@ -0,0 +1 @@
+usr/lib/libdupshf*
diff --git a/t/tests/shared-libs-control-file/debian/debian/libdupshf1.symbols b/t/tests/shared-libs-control-file/debian/debian/libdupshf1.symbols
new file mode 100644
index 0000000..166a346
--- /dev/null
+++ b/t/tests/shared-libs-control-file/debian/debian/libdupshf1.symbols
@@ -0,0 +1,3 @@
+libdupshf.so.1 libdupshf1 #MINVER#
+ e@Base 1.0
+ energy@Base 0.9
diff --git a/t/tests/shared-libs-control-file/debian/debian/rules b/t/tests/shared-libs-control-file/debian/debian/rules
index debbb28..80a2523 100644
--- a/t/tests/shared-libs-control-file/debian/debian/rules
+++ b/t/tests/shared-libs-control-file/debian/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+DUPSHF:=debian/libdupshf1/DEBIAN/shlibs
+
%:
dh $@
@@ -10,4 +12,6 @@ override_dh_builddeb:
echo "# aloha" > debian/libeshf1/DEBIAN/shlibs
echo "libfoo 1 libunshf1" >> debian/libunshf1/DEBIAN/shlibs
sed -i 's/libfdshf1/libforeign1/' debian/libfdshf1/DEBIAN/shlibs
+ cat $(DUPSHF) $(DUPSHF) > $(DUPSHF).tmp
+ mv -f $(DUPSHF).tmp $(DUPSHF)
dh_builddeb
diff --git a/t/tests/shared-libs-control-file/desc b/t/tests/shared-libs-control-file/desc
index 4e26978..78071c6 100644
--- a/t/tests/shared-libs-control-file/desc
+++ b/t/tests/shared-libs-control-file/desc
@@ -3,6 +3,7 @@ Sequence: 6000
Version: 1.0
Description: Test checks related to shlibs files
Test-For:
+ duplicate-entry-in-shlibs-control-file
no-shlibs-control-file
shlib-missing-in-control-file
shlibs-declares-dependency-on-other-package
diff --git a/t/tests/shared-libs-control-file/tags b/t/tests/shared-libs-control-file/tags
index b4a277e..36055f3 100644
--- a/t/tests/shared-libs-control-file/tags
+++ b/t/tests/shared-libs-control-file/tags
@@ -1,3 +1,4 @@
+E: libdupshf1: duplicate-entry-in-shlibs-control-file libdupshf 1
E: libeshf1: shlib-missing-in-control-file libeshf 1 for usr/lib/libeshf.so.1.0.1
E: libnoshf1: no-shlibs-control-file usr/lib/libnoshf.so.1.0.1
W: libfdshf1: shlibs-declares-dependency-on-other-package libforeign1
--
Debian package checker
Reply to: