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

[SCM] Debian package checker branch, master, updated. 2.4.3-100-g8e11d45



The following commit has been merged in the master branch:
commit 8e11d4561d53d605f1edc3abd19edd5924f5ee2c
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jan 2 12:11:58 2011 +0100

    Tests for missing ldconfig in post{inst,rm}.

diff --git a/t/COVERAGE b/t/COVERAGE
index e6780df..371d56d 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -163,7 +163,6 @@ shared-libs ldconfig-symlink-referencing-wrong-file
 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-should-call-ldconfig
 shared-libs postrm-unsafe-ldconfig
 shared-libs preinst-calls-ldconfig
 shared-libs prerm-calls-ldconfig
@@ -359,7 +358,6 @@ scripts update-alternatives-remove-called-in-postrm
 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 postinst-must-call-ldconfig
 shared-libs postrm-has-useless-call-to-ldconfig
 shared-libs sharedobject-in-library-directory-missing-soname
 shared-libs shlib-with-executable-bit
@@ -513,7 +511,6 @@ libbaz
   missing-dependency-on-perlapi
   missing-depends-line
   package-name-doesnt-match-sonames
-  postinst-must-call-ldconfig
   postinst-should-not-set-usr-doc-link
   shlib-with-executable-bit
 
diff --git a/t/tests/shared-libs-symbols-file/upstream/Makefile b/t/tests/shared-libs-ldconfig-scripts/debian/Makefile
similarity index 90%
copy from t/tests/shared-libs-symbols-file/upstream/Makefile
copy to t/tests/shared-libs-ldconfig-scripts/debian/Makefile
index ab3b59b..12ca9bd 100644
--- a/t/tests/shared-libs-symbols-file/upstream/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 libsym.so.1 libesym.so.1
+SONAMES:= libfoo.so.1
 LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
 
 all: $(LIBFILES)
diff --git a/t/tests/shared-libs-control-file/debian/code.c b/t/tests/shared-libs-ldconfig-scripts/debian/code.c
similarity index 100%
copy from t/tests/shared-libs-control-file/debian/code.c
copy to t/tests/shared-libs-ldconfig-scripts/debian/code.c
diff --git a/t/tests/cruft-crlf-eols/debian/debian/control.in b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
similarity index 73%
copy from t/tests/cruft-crlf-eols/debian/debian/control.in
copy to t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
index b2cd55a..002aa20 100644
--- a/t/tests/cruft-crlf-eols/debian/debian/control.in
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
@@ -1,14 +1,16 @@
-Source: {$srcpkg}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
-
-Package: {$srcpkg}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- 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.
+Source: {$srcpkg}
+Priority: extra
+Section: libs
+Maintainer: {$author}
+Standards-Version: {$standards_version}
+Build-Depends: debhelper (>= 7.0.50~)
+
+Package: libfoo1
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (missing 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 missing ldconfig in scripts.
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/postinst b/t/tests/shared-libs-ldconfig-scripts/debian/debian/postinst
new file mode 100755
index 0000000..2615bf9
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# No ldconfig
+if false ; then true ; fi
+
+# -- we will remove all debhelper stuff later.
+#DEBHELPER#
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/postrm b/t/tests/shared-libs-ldconfig-scripts/debian/debian/postrm
new file mode 100755
index 0000000..9b2f636
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/postrm
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if false ; then true ; fi
+
+
+# -- we will remove all debhelper stuff later.
+#DEBHELPER#
diff --git a/t/tests/md5sums-missing/debian/debian/rules b/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
old mode 100644
new mode 100755
similarity index 51%
copy from t/tests/md5sums-missing/debian/debian/rules
copy to t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
index 9d8ce3a..077e088
--- a/t/tests/md5sums-missing/debian/debian/rules
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/rules
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
 
-FIND ?= find
-
 %:
 	dh $@
 
 override_dh_builddeb:
-	$(FIND) debian/ -name 'md5sums' -delete
+	cp -af debian/postrm debian/postinst debian/libfoo1/DEBIAN/
 	dh_builddeb
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/symbols b/t/tests/shared-libs-ldconfig-scripts/debian/debian/symbols
new file mode 100644
index 0000000..a1f052b
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/symbols
@@ -0,0 +1,3 @@
+libfoo.so.1 libfoo1 #MINVER#
+ e@Base 1.0
+ energy@Base 0.9
diff --git a/t/tests/shared-libs-ldconfig-scripts/desc b/t/tests/shared-libs-ldconfig-scripts/desc
new file mode 100644
index 0000000..2cbadaa
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/desc
@@ -0,0 +1,7 @@
+Testname: shared-libs-ldconfig-scripts
+Sequence: 6000
+Version: 1.0
+Description: Test checks related to ldconfig in scripts
+Test-For: 
+ postinst-must-call-ldconfig
+ postrm-should-call-ldconfig
diff --git a/t/tests/shared-libs-ldconfig-scripts/tags b/t/tests/shared-libs-ldconfig-scripts/tags
new file mode 100644
index 0000000..6e69fa7
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/tags
@@ -0,0 +1,2 @@
+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

-- 
Debian package checker


Reply to: