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

[SCM] Debian package checker branch, master, updated. 2.4.3-95-g469c25a



The following commit has been merged in the master branch:
commit 53e9468851b184a39967384796f7f389355fba48
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jan 1 21:27:49 2011 +0100

    Added test for empty shlibs file (missing library in shlibs file).

diff --git a/t/COVERAGE b/t/COVERAGE
index 8df2968..0417283 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -365,7 +365,6 @@ shared-libs pkg-has-symbols-control-file-but-no-shared-libs
 shared-libs postinst-must-call-ldconfig
 shared-libs postrm-has-useless-call-to-ldconfig
 shared-libs sharedobject-in-library-directory-missing-soname
-shared-libs shlib-missing-in-control-file
 shared-libs shlib-with-executable-bit
 shared-libs shlibs-declares-dependency-on-other-package
 shared-libs symbols-declared-but-not-shlib
@@ -524,7 +523,6 @@ libbaz
   package-name-doesnt-match-sonames
   postinst-must-call-ldconfig
   postinst-should-not-set-usr-doc-link
-  shlib-missing-in-control-file
   shlib-with-executable-bit
   shlibs-declares-dependency-on-other-package
   unused-shlib-entry-in-control-file
diff --git a/t/tests/shared-libs-control-file/debian/Makefile b/t/tests/shared-libs-control-file/debian/Makefile
index d9249ef..1b018f1 100644
--- a/t/tests/shared-libs-control-file/debian/Makefile
+++ b/t/tests/shared-libs-control-file/debian/Makefile
@@ -1,7 +1,7 @@
 CC=gcc
 CFLAGS=-Wall -Winline -O2 -fPIC
 
-SONAMES:= libnoshf.so.1
+SONAMES:= libnoshf.so.1 libeshf.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 e3387ff..7ccd60b 100644
--- a/t/tests/shared-libs-control-file/debian/debian/control.in
+++ b/t/tests/shared-libs-control-file/debian/debian/control.in
@@ -14,3 +14,13 @@ Description: {$description} (no shlibs file)
  things.  It should not be installed like a regular package.
  .
  Checks for missing shlibs file.
+
+Package: libeshf1
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (empty shlibs file)
+ 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 empty shlibs file.
diff --git a/t/tests/shared-libs-control-file/debian/debian/libeshf1.install b/t/tests/shared-libs-control-file/debian/debian/libeshf1.install
new file mode 100644
index 0000000..5ef4c2d
--- /dev/null
+++ b/t/tests/shared-libs-control-file/debian/debian/libeshf1.install
@@ -0,0 +1 @@
+usr/lib/libeshf*
diff --git a/t/tests/shared-libs-control-file/debian/debian/libeshf1.symbols b/t/tests/shared-libs-control-file/debian/debian/libeshf1.symbols
new file mode 100644
index 0000000..fdd0204
--- /dev/null
+++ b/t/tests/shared-libs-control-file/debian/debian/libeshf1.symbols
@@ -0,0 +1,3 @@
+libeshf.so.1 libeshf1 #MINVER#
+ e@Base 1.0
+ energy@Base 0.9
diff --git a/t/tests/shared-libs-control-file/debian/debian/libnoshf1.install b/t/tests/shared-libs-control-file/debian/debian/libnoshf1.install
new file mode 100644
index 0000000..175a915
--- /dev/null
+++ b/t/tests/shared-libs-control-file/debian/debian/libnoshf1.install
@@ -0,0 +1 @@
+usr/lib/libnoshf*
diff --git a/t/tests/shared-libs-control-file/debian/debian/rules b/t/tests/shared-libs-control-file/debian/debian/rules
index 43525f4..2a35315 100644
--- a/t/tests/shared-libs-control-file/debian/debian/rules
+++ b/t/tests/shared-libs-control-file/debian/debian/rules
@@ -4,5 +4,8 @@
 	dh $@
 
 override_dh_builddeb:
+	# Work around "smart tools" that check the shlibs
+	# before installing them.
 	rm -f debian/libnoshf1/DEBIAN/shlibs
+	echo "# aloha" > debian/libeshf1/DEBIAN/shlibs
 	dh_builddeb
diff --git a/t/tests/shared-libs-control-file/desc b/t/tests/shared-libs-control-file/desc
index 33a1fcf..6da9dc9 100644
--- a/t/tests/shared-libs-control-file/desc
+++ b/t/tests/shared-libs-control-file/desc
@@ -4,3 +4,4 @@ Version: 1.0
 Description: Test checks related to shlibs files
 Test-For: 
  no-shlibs-control-file
+ shlib-missing-in-control-file
diff --git a/t/tests/shared-libs-control-file/tags b/t/tests/shared-libs-control-file/tags
index e7cadd7..4c2650d 100644
--- a/t/tests/shared-libs-control-file/tags
+++ b/t/tests/shared-libs-control-file/tags
@@ -1 +1,2 @@
+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

-- 
Debian package checker


Reply to: