[SCM] Debian package checker branch, master, updated. 2.4.3-19-g92b41fe
The following commit has been merged in the master branch:
commit 92b41fec86c4e25225d9e5a0d224d276f8666276
Author: Niels Thykier <niels@thykier.net>
Date: Fri Dec 3 22:41:43 2010 +0100
Add check for depending on specific system javadoc instead default-jdk-doc.
* Summary of tag changes:
+ Added:
- depends-on-specific-java-doc-package
* checks/fields{,.desc}:
+ [NT] Added check for packages (build) depending on openjdk-X-doc or
classpath-doc instead of the default-jdk-doc metapackage.
(Closes: #593837)
diff --git a/checks/fields b/checks/fields
index 5161ae2..e503a52 100644
--- a/checks/fields
+++ b/checks/fields
@@ -638,6 +638,13 @@ if (($type eq "binary") || ($type eq 'udeb')) {
if ($field eq 'recommends'
&& $pkg =~ m/^lib/ && $pkg !~ m/-(dev|docs?|tools|bin)$/
&& $part_d_orig =~ m/-docs?$/);
+
+ # default-jdk-doc must depend on openjdk-X-doc (or classpath-doc) to be
+ # useful; other packages should depend on default-jdk-doc if they
+ # want the Java Core API.
+ tag "depends-on-specific-java-doc-package", "$field"
+ if(&$is_dep_field($field) && $pkg ne 'default-jdk-doc'
+ && ($d_pkg eq 'classpath-doc' || $d_pkg =~ m/openjdk-\d+-doc/o));
}
for my $pkg (@seen_obsolete_packages) {
diff --git a/checks/fields.desc b/checks/fields.desc
index 2a77b7e..cf91829 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -1000,3 +1000,10 @@ Info: The given package declares a build dependency on either openjdk-
X-doc or classpath-doc instead of using default-jdk-doc. default-jdk-doc
provides a symlink to the API via /usr/share/default-jdk-doc/api.
+Tag: depends-on-specific-java-doc-package
+Severity: normal
+Certainty: certain
+Info: The package should use default-jdk-doc instead of classpath-doc
+ or openjdk-X-doc to ease transitions when the providing doc package
+ is replaced (e.g. openjdk-6-doc being replaced by openjdk-7-doc).
+
diff --git a/debian/changelog b/debian/changelog
index 788d98f..4eec353 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lintian (2.4.4) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
- build-depends-on-specific-java-doc-package
+ - depends-on-specific-java-doc-package
* checks/binaries:
+ [RA] Exclude kfreebsd-kernel-di-{amd64,i386} from the
@@ -12,7 +13,7 @@ lintian (2.4.4) UNRELEASED; urgency=low
+ [NT] Added missing import of "Util" perl module. Thanks to David
Bremner for the patch.
* checks/fields{,.desc}:
- + [NT] Added check for packages build depending on openjdk-X-doc or
+ + [NT] Added check for packages (build) depending on openjdk-X-doc or
classpath-doc instead of the default-jdk-doc metapackage.
(Closes: #593837)
* checks/files:
diff --git a/t/tests/fields-java/debian/debian/control.in b/t/tests/fields-java/debian/debian/control.in
index 8dbc64a..d03c194 100644
--- a/t/tests/fields-java/debian/debian/control.in
+++ b/t/tests/fields-java/debian/debian/control.in
@@ -5,9 +5,13 @@ Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7.0.50~), openjdk-6-doc
-Package: lib{$srcpkg}-java
+Package: lib{$srcpkg}-java-doc
Architecture: {$architecture}
+Section: doc
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Recommends: openjdk-6-doc
+# Negative testing as well, this should not be triggered.
+Replaces: openjdk-6-doc
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
diff --git a/t/tests/fields-java/desc b/t/tests/fields-java/desc
index 12e1005..52b570a 100644
--- a/t/tests/fields-java/desc
+++ b/t/tests/fields-java/desc
@@ -4,3 +4,4 @@ Version: 1.0
Description: General tests for java package (build) dependencies
Test-For:
build-depends-on-specific-java-doc-package
+ depends-on-specific-java-doc-package
diff --git a/t/tests/fields-java/tags b/t/tests/fields-java/tags
index 4f3321f..19f1802 100644
--- a/t/tests/fields-java/tags
+++ b/t/tests/fields-java/tags
@@ -1 +1,2 @@
W: fields-java source: build-depends-on-specific-java-doc-package openjdk-6-doc
+W: libfields-java-java-doc: depends-on-specific-java-doc-package recommends
--
Debian package checker
Reply to: