[SCM] Debian package checker branch, master, updated. 2.2.0-51-gda4f77c
The following commit has been merged in the master branch:
commit d681f4f1b920e10a09f692361b8ef12a7a9f6913
Author: Russ Allbery <rra@debian.org>
Date: Sat Jan 31 19:37:33 2009 -0800
Special-case build dependencies for dh_nativejava
* checks/debhelper{,.desc}:
+ [RA] default-jdk and default-jdk-builddep provide dh_nativejava as a
special case. (Closes: #513423)
diff --git a/checks/debhelper b/checks/debhelper
index 6d048c8..cfa7b27 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -99,6 +99,12 @@ while (<RULES>) {
}
if ($dh_commands_depends->known($dhcommand)) {
my $dep = $dh_commands_depends->value($dhcommand);
+
+ # Special-case default-jdk-builddep. It appears to be a sort of
+ # build-essential for Java applications.
+ if ($dhcommand eq 'dh_nativejava') {
+ $dep = "$dep | default-jdk | default-jdk-builddep";
+ }
$missingbdeps{$dep} = $dhcommand;
}
if ($versions{$dhcommand}) {
diff --git a/debian/changelog b/debian/changelog
index 1c98732..1449cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ lintian (2.2.1) UNRELEASED; urgency=low
aren't numbers. Warn of compatibility levels that aren't numbers.
Use the same compatibility level that debhelper would use in some
other checks. Patch from Raphael Geissert. (Closes: #513767)
+ + [RA] default-jdk and default-jdk-builddep provide dh_nativejava as a
+ special case. (Closes: #513423)
* checks/fields:
+ [RA] Allow but do not require a libmodule-build-perl dependency if
the Build script is referenced in clean. Thanks, Charles Plessy and
diff --git a/t/tests/debhelper-dh-depends/debian/debian/control.in b/t/tests/debhelper-dh-nativejava/debian/debian/control.in
similarity index 88%
copy from t/tests/debhelper-dh-depends/debian/debian/control.in
copy to t/tests/debhelper-dh-nativejava/debian/debian/control.in
index 719f55b..c58b583 100644
--- a/t/tests/debhelper-dh-depends/debian/debian/control.in
+++ b/t/tests/debhelper-dh-nativejava/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7), default-jdk-builddep
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/debhelper-arch-depends/debian/debian/rules b/t/tests/debhelper-dh-nativejava/debian/debian/rules
similarity index 90%
copy from t/tests/debhelper-arch-depends/debian/debian/rules
copy to t/tests/debhelper-dh-nativejava/debian/debian/rules
index 27900c2..3045226 100755
--- a/t/tests/debhelper-arch-depends/debian/debian/rules
+++ b/t/tests/debhelper-dh-nativejava/debian/debian/rules
@@ -6,5 +6,5 @@ binary: binary-arch binary-indep
binary-arch:
binary-indep:
dh binary-indep --until dh_prep
- -dh_clideps
+ -dh_nativejava
dh binary-indep --remaining
diff --git a/t/tests/debhelper-dh-nativejava/desc b/t/tests/debhelper-dh-nativejava/desc
new file mode 100644
index 0000000..9621317
--- /dev/null
+++ b/t/tests/debhelper-dh-nativejava/desc
@@ -0,0 +1,5 @@
+Testname: debhelper-dh-nativejava
+Sequence: 6000
+Version: 1.0
+Description: Dependency handling for dh_nativejava
+Test-Against: missing-build-dependency-for-dh_-command
diff --git a/t/tests/basic-non-native/tags b/t/tests/debhelper-dh-nativejava/tags
similarity index 100%
copy from t/tests/basic-non-native/tags
copy to t/tests/debhelper-dh-nativejava/tags
--
Debian package checker
Reply to: