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

[SCM] Debian package checker branch, master, updated. 2.4.3-67-g1282bb6



The following commit has been merged in the master branch:
commit 1282bb612b48c2aca18254ef525ebe6c3c51bc55
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Dec 28 21:14:17 2010 +0100

    Added test for "depends on multiple <something>" tags.

diff --git a/t/COVERAGE b/t/COVERAGE
index ad5a397..d43bca7 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -247,11 +247,6 @@ fields depends-exclusively-on-makedev
 fields depends-on-old-emacs
 fields depends-on-python-minimal
 fields malformed-dm-upload-allowed
-fields package-depends-on-multiple-libpng-versions
-fields package-depends-on-multiple-libstdc-versions
-fields package-depends-on-multiple-tcl-versions
-fields package-depends-on-multiple-tk-versions
-fields package-depends-on-multiple-tkx-versions
 fields redundant-bugs-field
 fields redundant-origin-field
 fields unknown-section
@@ -609,11 +604,6 @@ maintainer-scripts
 relations
   depends-exclusively-on-makedev
   depends-on-old-emacs
-  package-depends-on-multiple-libpng-versions
-  package-depends-on-multiple-libstdc-versions
-  package-depends-on-multiple-tcl-versions
-  package-depends-on-multiple-tk-versions
-  package-depends-on-multiple-tkx-versions
   quilt-build-dep-but-no-series-file
   redundant-bugs-field
   redundant-origin-field
diff --git a/t/tests/control-file-suggests-itself/debian/debian/control.in b/t/tests/fields-multiple-x-deps/debian/debian/control.in
similarity index 67%
copy from t/tests/control-file-suggests-itself/debian/debian/control.in
copy to t/tests/fields-multiple-x-deps/debian/debian/control.in
index 86553ca..00e49bc 100644
--- a/t/tests/control-file-suggests-itself/debian/debian/control.in
+++ b/t/tests/fields-multiple-x-deps/debian/debian/control.in
@@ -7,10 +7,15 @@ Build-Depends: debhelper (>= 7)
 
 Package: {$srcpkg}
 Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Suggests: {$srcpkg}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\},
+         libstdc++2.10, libstdc++2.10-glibc2.2, libstdc++3.0,
+         tk8.2, tk8.3,
+         tcl8.0, tcl8.2,
+         tkx8.2, tkx8.3, tclx8.2,
+         libpng2, libpng3
 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.  It may
  be an empty package.
+
diff --git a/t/tests/fields-multiple-x-deps/desc b/t/tests/fields-multiple-x-deps/desc
new file mode 100644
index 0000000..89f9ffe
--- /dev/null
+++ b/t/tests/fields-multiple-x-deps/desc
@@ -0,0 +1,10 @@
+Testname: fields-multiple-x-deps
+Sequence: 6000
+Version: 1.0
+Description: Tests for multiple depends on X
+Test-For:
+  package-depends-on-multiple-libpng-versions
+  package-depends-on-multiple-libstdc-versions
+  package-depends-on-multiple-tcl-versions
+  package-depends-on-multiple-tk-versions
+  package-depends-on-multiple-tkx-versions
diff --git a/t/tests/fields-multiple-x-deps/tags b/t/tests/fields-multiple-x-deps/tags
new file mode 100644
index 0000000..06ee336
--- /dev/null
+++ b/t/tests/fields-multiple-x-deps/tags
@@ -0,0 +1,5 @@
+E: fields-multiple-x-deps: package-depends-on-multiple-libpng-versions libpng2 libpng3
+E: fields-multiple-x-deps: package-depends-on-multiple-libstdc-versions libstdc++2.10 libstdc++2.10-glibc2.2 libstdc++3.0
+E: fields-multiple-x-deps: package-depends-on-multiple-tcl-versions tcl8.0 tcl8.2
+E: fields-multiple-x-deps: package-depends-on-multiple-tk-versions tk8.2 tk8.3
+E: fields-multiple-x-deps: package-depends-on-multiple-tkx-versions tkx8.2 tkx8.3

-- 
Debian package checker


Reply to: