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

[SCM] Debian package checker branch, master, updated. 2.4.3-92-g15cf235



The following commit has been merged in the master branch:
commit 15cf23508362965c0d49888f805110c4c41e19bb
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jan 1 21:05:00 2011 +0100

    Test for shlib-missing-in-symbols-control-file.

diff --git a/t/COVERAGE b/t/COVERAGE
index 79996b0..f3c9d7a 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -367,7 +367,6 @@ 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-missing-in-symbols-control-file
 shared-libs shlib-with-executable-bit
 shared-libs shlibs-declares-dependency-on-other-package
 shared-libs symbols-declared-but-not-shlib
@@ -527,7 +526,6 @@ libbaz
   postinst-must-call-ldconfig
   postinst-should-not-set-usr-doc-link
   shlib-missing-in-control-file
-  shlib-missing-in-symbols-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-symbols-file/debian/debian/control.in b/t/tests/shared-libs-symbols-file/debian/debian/control.in
index 17740a4..61c7f03 100644
--- a/t/tests/shared-libs-symbols-file/debian/debian/control.in
+++ b/t/tests/shared-libs-symbols-file/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
 Section: libs
 Maintainer: {$author}
 Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
 
 Package: libfoo1
 Architecture: any
@@ -24,3 +24,14 @@ Description: {$description} (missing)
  things.  It should not be installed like a regular package.
  .
  Checks for missing symbol file.
+
+
+Package: libesym1
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (empty symbols)
+ 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 symbol file/missing shlib in symbols file.
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/libesym1.install b/t/tests/shared-libs-symbols-file/debian/debian/libesym1.install
new file mode 100644
index 0000000..750092c
--- /dev/null
+++ b/t/tests/shared-libs-symbols-file/debian/debian/libesym1.install
@@ -0,0 +1 @@
+usr/lib/libesym*
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install b/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install
index 54fb13a..f3a3a05 100644
--- a/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install
+++ b/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install
@@ -1 +1 @@
-usr/lib/*foo*
+usr/lib/libfoo*
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/libsym1.install b/t/tests/shared-libs-symbols-file/debian/debian/libsym1.install
index 7d3a6b6..7faef4f 100644
--- a/t/tests/shared-libs-symbols-file/debian/debian/libsym1.install
+++ b/t/tests/shared-libs-symbols-file/debian/debian/libsym1.install
@@ -1 +1 @@
-usr/lib/*sym*
+usr/lib/libsym*
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/rules b/t/tests/shared-libs-symbols-file/debian/debian/rules
new file mode 100644
index 0000000..03030bc
--- /dev/null
+++ b/t/tests/shared-libs-symbols-file/debian/debian/rules
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_builddeb:
+	# Apparently some of the tools are too smart to install
+	# a redundant/empty symbols file in the package, so here
+	# is a non-empty useless symbols file!
+	echo "# Aloha!" > debian/libesym1/DEBIAN/symbols
+	dh_builddeb
diff --git a/t/tests/shared-libs-symbols-file/desc b/t/tests/shared-libs-symbols-file/desc
index 2aaead8..73a2b97 100644
--- a/t/tests/shared-libs-symbols-file/desc
+++ b/t/tests/shared-libs-symbols-file/desc
@@ -5,5 +5,6 @@ Type: non-native
 Description: Test checks related to symbols files
 Test-For: 
  no-symbols-control-file
+ shlib-missing-in-symbols-control-file
  symbols-file-contains-current-version-with-debian-revision
  symbols-file-contains-debian-revision
diff --git a/t/tests/shared-libs-symbols-file/tags b/t/tests/shared-libs-symbols-file/tags
index 8d2c1cb..5cf08bc 100644
--- a/t/tests/shared-libs-symbols-file/tags
+++ b/t/tests/shared-libs-symbols-file/tags
@@ -1,3 +1,4 @@
 E: libfoo1: symbols-file-contains-current-version-with-debian-revision on symbol e@Base
 I: libsym1: no-symbols-control-file usr/lib/libsym.so.1.0.1
+W: libesym1: shlib-missing-in-symbols-control-file libesym 1 for usr/lib/libesym.so.1.0.1
 W: libfoo1: symbols-file-contains-debian-revision on symbol energy@Base
diff --git a/t/tests/shared-libs-symbols-file/upstream/Makefile b/t/tests/shared-libs-symbols-file/upstream/Makefile
index 4a1e4db..ab3b59b 100644
--- a/t/tests/shared-libs-symbols-file/upstream/Makefile
+++ b/t/tests/shared-libs-symbols-file/upstream/Makefile
@@ -1,16 +1,13 @@
 CC=gcc
 CFLAGS=-Wall -Winline -O2 -fPIC
 
-FOO_SONAME:= libfoo.so.1
-SYM_SONAME:= libsym.so.1
+SONAMES:= libfoo.so.1 libsym.so.1 libesym.so.1
+LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
 
-all: libfoo.so.1.0.1 libsym.so.1.0.1
+all: $(LIBFILES)
 
-libfoo.so.1.0.1: code.o
-	$(CC) -o $@ -shared -Wl,-soname,$(FOO_SONAME) $^ -lc
-
-libsym.so.1.0.1: code.o
-	$(CC) -o $@ -shared -Wl,-soname,$(SYM_SONAME) $^ -lc
+$(LIBFILES): code.o
+	$(CC) -o $@ -shared -Wl,-soname,$(patsubst %.0.1,%,$@) $^ -lc
 
 clean:
 	rm -f *.a *.o *.so*
@@ -18,7 +15,8 @@ clean:
 install: all
 	install -m 0755 -d $(DESTDIR)/usr/lib
 	install -m 0644 *.so* $(DESTDIR)/usr/lib
-	ln -s libfoo.so.1.0.1 $(DESTDIR)/usr/lib/$(FOO_SONAME)
-	ln -s libsym.so.1.0.1 $(DESTDIR)/usr/lib/$(SYM_SONAME)
+	for FILE in $(SONAMES) ; do \
+	    ln -s $${FILE}.0.1 $(DESTDIR)/usr/lib/$$FILE ; \
+	done
 
 .PHONY: install clean

-- 
Debian package checker


Reply to: