[SCM] Debian package checker branch, master, updated. 2.4.3-17-g1330193
The following commit has been merged in the master branch:
commit 1330193cdf9880dbc4553ea5e6fd99b63892134b
Author: Niels Thykier <niels@thykier.net>
Date: Sat Aug 21 14:15:32 2010 +0200
Add check for build-depending on specific system javadoc instead of default-jdk-doc
* Summary of tag changes:
+ Added:
- build-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)
* t/tests/fields-java:
+ [NT] Added test for new tag.
diff --git a/checks/fields b/checks/fields
index 5b4b5e7..5161ae2 100644
--- a/checks/fields
+++ b/checks/fields
@@ -726,6 +726,10 @@ if ($type eq "source") {
}
}
+ if($d_pkg =~ m/openjdk-\d+-doc/o or $d_pkg eq 'classpath-doc'){
+ tag 'build-depends-on-specific-java-doc-package', $d_pkg;
+ }
+
tag 'conflicting-negation-in-source-relation', "$field: $part_d_orig"
unless (not $d_arch or $d_arch->[1] == 0 or $d_arch->[1] eq @{ $d_arch->[0] });
diff --git a/checks/fields.desc b/checks/fields.desc
index eff85cc..2a77b7e 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -992,3 +992,11 @@ Info: The given package appears to have a Python development package
If you are building a Python extension instead, you should have
development packages listed in Build-Depends, but normally there should
be at least one Architecture: any package.
+
+Tag: build-depends-on-specific-java-doc-package
+Severity: normal
+Certainty: certain
+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.
+
diff --git a/debian/changelog b/debian/changelog
index fbad20e..d9e4ddc 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
lintian (2.4.4) UNRELEASED; urgency=low
+ * Summary of tag changes:
+ + Added:
+ - build-depends-on-specific-java-doc-package
+
* checks/binaries:
+ [RA] Exclude kfreebsd-kernel-di-{amd64,i386} from the
embedded-zlib check since it's in the kernel. (Closes: #593397)
@@ -7,6 +11,10 @@ lintian (2.4.4) UNRELEASED; urgency=low
* checks/debian-source-dir:
+ [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
+ classpath-doc instead of the default-jdk-doc metapackage.
+ (Closes: #593837)
* checks/files:
+ [NT] Fixed false-positive extra-license-file for license.ui files.
Thanks to Jeremy Sanders for the report. (Closes: #595941)
@@ -46,6 +54,8 @@ lintian (2.4.4) UNRELEASED; urgency=low
* t/tests/files-extra-license:
+ [NT] Added new test.
+ * t/tests/fields-java:
+ + [NT] Added test for new tag.
* t/tests/rules-not-makefile:
+ [NT] Added new test.
* t/tests/scripts-missing-dep:
diff --git a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in b/t/tests/fields-java/debian/debian/control.in
similarity index 81%
copy from t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
copy to t/tests/fields-java/debian/debian/control.in
index 4a5a774..8dbc64a 100644
--- a/t/tests/debhelper-dh-clean-k-ok/debian/debian/control.in
+++ b/t/tests/fields-java/debian/debian/control.in
@@ -1,11 +1,11 @@
Source: {$srcpkg}
Priority: extra
-Section: {$section}
+Section: java
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 7.0.50~), openjdk-6-doc
-Package: {$srcpkg}
+Package: lib{$srcpkg}-java
Architecture: {$architecture}
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: {$description}
@@ -13,3 +13,4 @@ Description: {$description}
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-depends-general/debian/debian/install b/t/tests/fields-java/debian/debian/install
similarity index 100%
copy from t/tests/fields-depends-general/debian/debian/install
copy to t/tests/fields-java/debian/debian/install
diff --git a/t/tests/fields-depends-general/debian/some-file b/t/tests/fields-java/debian/some-file
similarity index 100%
copy from t/tests/fields-depends-general/debian/some-file
copy to t/tests/fields-java/debian/some-file
diff --git a/t/tests/fields-java/desc b/t/tests/fields-java/desc
new file mode 100644
index 0000000..12e1005
--- /dev/null
+++ b/t/tests/fields-java/desc
@@ -0,0 +1,6 @@
+Testname: fields-java
+Sequence: 6000
+Version: 1.0
+Description: General tests for java package (build) dependencies
+Test-For:
+ build-depends-on-specific-java-doc-package
diff --git a/t/tests/fields-java/tags b/t/tests/fields-java/tags
new file mode 100644
index 0000000..4f3321f
--- /dev/null
+++ b/t/tests/fields-java/tags
@@ -0,0 +1 @@
+W: fields-java source: build-depends-on-specific-java-doc-package openjdk-6-doc
--
Debian package checker
Reply to: