Undo the d-jdk-builddep rename patch.

6 files changed, 4 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index d9e0b5a..ec952ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-java-common (0.37) UNRELEASED; urgency=low
-
-  * Renamed default-jdk-builddep to gcj-native-helper.
-
- -- Niels Thykier <niels@thykier.net>  Thu, 06 May 2010 17:59:01 +0200
-
 java-common (0.36) unstable; urgency=low
 
   * Correct a ${jdk} that should have been a ${jre} in the decription
diff --git a/debian/control b/debian/control
index ef3bc5c..1a8c816 100644
--- a/debian/control
+++ b/debian/control
@@ -70,10 +70,9 @@ Description: Standard Java or Java compatible Development Kit (documentation)
  or Java compatible development kit recommended for Debian, which is
  ${doc}.
 
-Package: gcj-native-helper
+Package: default-jdk-builddep
 Architecture: any
 Depends: default-jdk (= ${binary:Version}), ${jdk:builddep}, ${misc:Depends}
-Provides: default-jdk-builddep
 Description: Standard Java or Java compatible build dependencies
  This package points to the build dependencies used to build
  packages requiring a Java or Java compatible Development Kit.
diff --git a/debian/default-jdk-builddep.install b/debian/default-jdk-builddep.install
index afda536..7ad8902 100644
--- a/debian/default-jdk-builddep.install
+++ b/debian/default-jdk-builddep.install
@@ -1 +1 @@
-debian/lintian/gcj-native-helper /usr/share/lintian/overrides
+debian/lintian/default-jdk-builddep /usr/share/lintian/overrides
diff --git a/debian/lintian/default-jdk-builddep b/debian/lintian/default-jdk-builddep
new file mode 100644
index 0000000..2654685
--- /dev/null
+++ b/debian/lintian/default-jdk-builddep
@@ -0,0 +1 @@
+default-jdk-builddep: cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package
diff --git a/debian/lintian/gcj-native-helper b/debian/lintian/gcj-native-helper
deleted file mode 100644
index 2eac5ec..0000000
--- a/debian/lintian/gcj-native-helper
+++ /dev/null
@@ -1 +0,0 @@
-gcj-native-helper: cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package
diff --git a/debian/rules b/debian/rules
index 8bc37f5..a7aed43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ ifneq (,$(p_jre))
 	dh_installchangelogs -pdefault-jre-headless
 	dh_link -pdefault-jre-headless \
 		usr/lib/jvm/$(jvmdir) usr/lib/jvm/default-java
-	for p in default-jre-headless default-jre default-jdk gcj-native-helper; do \
+	for p in default-jre-headless default-jre default-jdk default-jdk-builddep; do \
 	  [ -z "$$t" ] && t=$$p && continue; \
 	  mkdir -p debian/$$p/usr/share/doc; \
 	  ln -sf $$t debian/$$p/usr/share/doc/$$p; \