[SCM] Debian package checker branch, master, updated. 2.5.4-37-g385c44b
The following commit has been merged in the master branch:
commit 385c44b12c22c4615d0a1df3f3a96ca660d6f026
Author: Niels Thykier <niels@thykier.net>
Date: Thu Dec 8 10:38:35 2011 +0100
doc-pkg-depends-on-main-pkg should also be triggered with Depends
A mistake in the regex caused the tag only to be triggered if the
relation was "Pre-Depends".
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/fields b/checks/fields
index 0793233..882e5e2 100644
--- a/checks/fields
+++ b/checks/fields
@@ -658,7 +658,7 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
&& $pkg !~ /^python[\d.]*-minimal$/);
tag 'doc-package-depends-on-main-package', $field
- if ("$d_pkg-doc" eq $pkg && $field =~ /^(pre-)depends$/);
+ if ("$d_pkg-doc" eq $pkg && $field =~ /^(?:pre-)?depends$/);
# only trigger this for the the preferred alternative
tag 'versioned-dependency-satisfied-by-perl', "$field: $part_d_orig"
diff --git a/debian/changelog b/debian/changelog
index 6708e11..af96d13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ lintian (2.5.5) UNRELEASED; urgency=low
+ [NT] Added section-mapping for (some) zope packages. This
fixes some false-positives where python-zope packages were
wrongly identified as belong to the python section.
+ + [NT] Fixed an issue where "doc-pkg-depends-on-main-pkg" would
+ only be triggered if it was a "pre-depends" relation.
* checks/files:
+ [JW,NT] Skip "Multi-Arch: same" check of gzip files if their
install path contains the architecture. (Closes: #650665)
diff --git a/t/COVERAGE b/t/COVERAGE
index 270e33f..8df217a 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-12-04
-Coverage: 778/950 (81.89%), w. legacy tests: 886/950 (93.26%)
+Last generated 2011-12-08
+Coverage: 779/949 (82.09%), w. legacy tests: 887/949 (93.47%)
The following tags are not tested by the test suite:
@@ -25,9 +25,7 @@ debconf select-without-choices
debconf unknown-field-in-templates
debconf unknown-template-type
-fields aspell-package-not-arch-all
fields bad-menu-item
-fields doc-package-depends-on-main-package
fields malformed-python-version
fields no-source-field
diff --git a/t/tests/fields-depends-general/debian/debian/control.in b/t/tests/fields-depends-general/debian/debian/control.in
index f0a0f8f..bc0fd42 100644
--- a/t/tests/fields-depends-general/debian/debian/control.in
+++ b/t/tests/fields-depends-general/debian/debian/control.in
@@ -42,3 +42,15 @@ Description: {$description} - Fake Python package
be an empty package.
.
The fake Python package.
+
+Package: {$srcpkg}-doc
+Section: doc
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, {$srcpkg}
+Description: {$description} - Fake Doc package
+ 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.
+ .
+ The fake doc package.
diff --git a/t/tests/fields-depends-general/desc b/t/tests/fields-depends-general/desc
index 59ea5cf..7174af9 100644
--- a/t/tests/fields-depends-general/desc
+++ b/t/tests/fields-depends-general/desc
@@ -14,6 +14,7 @@ Test-For:
depends-on-old-emacs
depends-on-packaging-dev
depends-on-python-minimal
+ doc-package-depends-on-main-package
lib-recommends-documentation
needlessly-depends-on-awk
ored-depends-on-obsolete-package
diff --git a/t/tests/fields-depends-general/tags b/t/tests/fields-depends-general/tags
index 497dc02..fedbc28 100644
--- a/t/tests/fields-depends-general/tags
+++ b/t/tests/fields-depends-general/tags
@@ -9,6 +9,7 @@ E: py-fields-depends-general: depends-on-python-minimal depends
I: fields-depends-general: conflicts-with-version package-with-version (<< 3.0)
I: fields-depends-general: ored-depends-on-obsolete-package depends: xbase-clients
W: fields-depends-general source: package-depends-on-itself fields-depends-general depends
+W: fields-depends-general-doc: doc-package-depends-on-main-package depends
W: fields-depends-general: breaks-without-version package-without-version
W: fields-depends-general: depends-exclusively-on-makedev depends
W: fields-depends-general: depends-on-old-emacs depends: emacs21
--
Debian package checker
Reply to: