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

[SCM] Debian package checker branch, master, updated. 2.4.3-88-ga5d8dfb



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

    Extended test to handle "missing symbols file".

diff --git a/t/COVERAGE b/t/COVERAGE
index 5bd6ee2..7ec0a6e 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2010-12-31
+Last generated 2011-01-01
 
 The following tags are not tested by the test suite:
 
@@ -365,7 +365,6 @@ 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
-shared-libs no-symbols-control-file
 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
@@ -528,7 +527,6 @@ libbaz
   maintainer-shell-script-fails-syntax-check
   missing-dependency-on-perlapi
   missing-depends-line
-  no-symbols-control-file
   package-name-doesnt-match-sonames
   postinst-must-call-ldconfig
   postinst-should-not-set-usr-doc-link
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 7b15dd1..17740a4 100644
--- a/t/tests/shared-libs-symbols-file/debian/debian/control.in
+++ b/t/tests/shared-libs-symbols-file/debian/debian/control.in
@@ -8,7 +8,19 @@ Build-Depends: debhelper (>= 7)
 Package: libfoo1
 Architecture: any
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
+Description: {$description} (deb revision)
  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 deb revisions in symbols files.
+
+Package: libsym1
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (missing)
+ 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 missing symbol file.
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install b/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install
new file mode 100644
index 0000000..54fb13a
--- /dev/null
+++ b/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.install
@@ -0,0 +1 @@
+usr/lib/*foo*
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/symbols b/t/tests/shared-libs-symbols-file/debian/debian/libfoo1.symbols
similarity index 100%
rename from t/tests/shared-libs-symbols-file/debian/debian/symbols
rename to t/tests/shared-libs-symbols-file/debian/debian/libfoo1.symbols
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/libsym1.install b/t/tests/shared-libs-symbols-file/debian/debian/libsym1.install
new file mode 100644
index 0000000..7d3a6b6
--- /dev/null
+++ b/t/tests/shared-libs-symbols-file/debian/debian/libsym1.install
@@ -0,0 +1 @@
+usr/lib/*sym*
diff --git a/t/tests/shared-libs-symbols-file/desc b/t/tests/shared-libs-symbols-file/desc
index c178973..2aaead8 100644
--- a/t/tests/shared-libs-symbols-file/desc
+++ b/t/tests/shared-libs-symbols-file/desc
@@ -4,5 +4,6 @@ Version: 1.0-1
 Type: non-native
 Description: Test checks related to symbols files
 Test-For: 
+ no-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 80e7e0e..8d2c1cb 100644
--- a/t/tests/shared-libs-symbols-file/tags
+++ b/t/tests/shared-libs-symbols-file/tags
@@ -1,2 +1,3 @@
 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: 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 d2af7a3..4a1e4db 100644
--- a/t/tests/shared-libs-symbols-file/upstream/Makefile
+++ b/t/tests/shared-libs-symbols-file/upstream/Makefile
@@ -1,19 +1,24 @@
 CC=gcc
 CFLAGS=-Wall -Winline -O2 -fPIC
 
-SONAME:= libfoo.so.1
+FOO_SONAME:= libfoo.so.1
+SYM_SONAME:= libsym.so.1
 
-all: libfoo.so.1.0.1
+all: libfoo.so.1.0.1 libsym.so.1.0.1
 
 libfoo.so.1.0.1: code.o
-	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
+	$(CC) -o $@ -shared -Wl,-soname,$(FOO_SONAME) $^ -lc
+
+libsym.so.1.0.1: code.o
+	$(CC) -o $@ -shared -Wl,-soname,$(SYM_SONAME) $^ -lc
 
 clean:
-	rm -f *.a *.o *.so* *.sho
+	rm -f *.a *.o *.so*
 
 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/$(SONAME)
+	ln -s libfoo.so.1.0.1 $(DESTDIR)/usr/lib/$(FOO_SONAME)
+	ln -s libsym.so.1.0.1 $(DESTDIR)/usr/lib/$(SYM_SONAME)
 
 .PHONY: install clean

-- 
Debian package checker


Reply to: