[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 469c25aadf230367f63778ba1345b653b387b6f1
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Jan 1 21:32:52 2011 +0100

    Added test for pkg-has-symbols-control-file-but-no-shared-libs.

diff --git a/t/COVERAGE b/t/COVERAGE
index 0417283..e51996d 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -361,7 +361,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 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
@@ -461,7 +460,6 @@ debug
   duplicate-entry-in-symbols-control-file
   invalid-template-id-in-symbols-file
   missing-dependency-on-libc
-  pkg-has-symbols-control-file-but-no-shared-libs
   shared-lib-without-dependency-information
   sharedobject-in-library-directory-missing-soname
   symbols-declared-but-not-shlib
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 61c7f03..77455c2 100644
--- a/t/tests/shared-libs-symbols-file/debian/debian/control.in
+++ b/t/tests/shared-libs-symbols-file/debian/debian/control.in
@@ -35,3 +35,13 @@ Description: {$description} (empty symbols)
  things.  It should not be installed like a regular package.
  .
  Checks for empty symbol file/missing shlib in symbols file.
+
+Package: nolibrary
+Architecture: all
+Depends: $\{misc:Depends\}
+Description: {$description} (not a library)
+ 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.
+ .
+ Check for shipping a symbols file without a library.
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/nolibrary.install b/t/tests/shared-libs-symbols-file/debian/debian/nolibrary.install
new file mode 100644
index 0000000..241d370
--- /dev/null
+++ b/t/tests/shared-libs-symbols-file/debian/debian/nolibrary.install
@@ -0,0 +1 @@
+someconf.conf etc/
diff --git a/t/tests/shared-libs-symbols-file/debian/debian/rules b/t/tests/shared-libs-symbols-file/debian/debian/rules
index 03030bc..ec70acb 100644
--- a/t/tests/shared-libs-symbols-file/debian/debian/rules
+++ b/t/tests/shared-libs-symbols-file/debian/debian/rules
@@ -8,4 +8,5 @@ override_dh_builddeb:
 	# a redundant/empty symbols file in the package, so here
 	# is a non-empty useless symbols file!
 	echo "# Aloha!" > debian/libesym1/DEBIAN/symbols
+	echo "# Aloha!" > debian/nolibrary/DEBIAN/symbols
 	dh_builddeb
diff --git a/t/tests/shared-libs-symbols-file/desc b/t/tests/shared-libs-symbols-file/desc
index 73a2b97..0f1f66e 100644
--- a/t/tests/shared-libs-symbols-file/desc
+++ b/t/tests/shared-libs-symbols-file/desc
@@ -5,6 +5,7 @@ Type: non-native
 Description: Test checks related to symbols files
 Test-For: 
  no-symbols-control-file
+ pkg-has-symbols-control-file-but-no-shared-libs
  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 5cf08bc..83c4d7d 100644
--- a/t/tests/shared-libs-symbols-file/tags
+++ b/t/tests/shared-libs-symbols-file/tags
@@ -1,4 +1,5 @@
 E: libfoo1: symbols-file-contains-current-version-with-debian-revision on symbol e@Base
+E: nolibrary: pkg-has-symbols-control-file-but-no-shared-libs
 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/someconf.conf b/t/tests/shared-libs-symbols-file/upstream/someconf.conf
new file mode 100644
index 0000000..16940ea
--- /dev/null
+++ b/t/tests/shared-libs-symbols-file/upstream/someconf.conf
@@ -0,0 +1,2 @@
+# Yada yada yada
+Var=Val

-- 
Debian package checker


Reply to: