[SCM] Debian package checker branch, master, updated. 2.4.3-29-g3fbea3b

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 3fbea3b933c3591959165b3e6d61b90b4a0c41a7
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Dec 9 21:50:02 2010 +0100

    Deprecate default-jdk-builddep and correct list of packages providing dh_nativejava.
    
      * checks/debhelper:
        + [NT] Fix dependency check for dh_nativejava, default-jdk has never
          provided dh_nativejava.  (Closes: #606506)
    
      * data/fields/obsolete-packages:
        + [NT] Added default-jdk-builddep (replaced by gcj-native-helper).

diff --git a/checks/debhelper b/checks/debhelper
index 56bbc00..32adec2 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -120,10 +120,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.
+		# Special-case gcj-native-helper, which is a meta-package to
+		# pull this helper. default-jdk-builddep is obsolete, but
+		# we keep it for backwards compatibility, because it used to
+		# serve this purpose.
 		if ($dhcommand eq 'dh_nativejava') {
-		    $dep = "$dep | default-jdk | default-jdk-builddep";
+		    $dep = "$dep | gcj-native-helper | default-jdk-builddep";
 		}
 		$missingbdeps{$dep} = $dhcommand;
 	    }
diff --git a/data/fields/obsolete-packages b/data/fields/obsolete-packages
index 9726cf0..e4f2a17 100644
--- a/data/fields/obsolete-packages
+++ b/data/fields/obsolete-packages
@@ -56,3 +56,7 @@ xlibmesa-gl
 xlibmesa-gl-dev
 xlibmesa-glu
 xutils
+
+# Last seen in Squeeze
+default-jdk-builddep
+
diff --git a/debian/changelog b/debian/changelog
index 877755a..beea800 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ lintian (2.4.4) UNRELEASED; urgency=low
     + [RA] Exclude kfreebsd-kernel-di-{amd64,i386} from the
       embedded-zlib check since it's in the kernel.  (Closes: #593397)
     + [RG] Add swipl to the list of known interpreters.  (Closes: #591316)
+  * checks/debhelper:
+    + [NT] Fix dependency check for dh_nativejava, default-jdk has never
+      provided dh_nativejava.  (Closes: #606506)
   * checks/debian-source-dir:
     + [NT] Added missing import of "Util" perl module.  Thanks to David
       Bremner for the patch.
@@ -37,6 +40,8 @@ lintian (2.4.4) UNRELEASED; urgency=low
       intrepid and jaunty.
   * data/fields/essential:
     + [RG] Add hurd.  (Closes: #591323)
+  * data/fields/obsolete-packages:
+    + [NT] Added default-jdk-builddep (replaced by gcj-native-helper).
 
   * debian/control:
     + [RA] Add the build dependencies required to run the test suite
diff --git a/t/tests/debhelper-dh-nativejava/debian/debian/control.in b/t/tests/debhelper-dh-nativejava/debian/debian/control.in
index cff247e..ccc9a46 100644
--- a/t/tests/debhelper-dh-nativejava/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: {$standards_version}
-Build-Depends: debhelper (>= 7), default-jdk-builddep
+Build-Depends: debhelper (>= 7), gcj-native-helper
 
 Package: {$srcpkg}
 Architecture: {$architecture}

-- 
Debian package checker