java-common (0.38) UNRELEASED; urgency=low

  * Updated the description of gcj-native-helper and also the
    previous changelog entry to clarify that gcj-native-helper
    is only a partial replacement for default-jdk-builddep.
    
    Please see README.gcj-native-transition in the java-common
    package for more information on the transition.
  * Added missing Replaces/Conflicts for gcj-native-helper.
  * Bumped Standards-Versions to 3.9.0 - no changes required.

 -- Niels Thykier <niels@thykier.net>  Wed, 30 Jun 2010 22:05:13 +0200

4 files changed, 57 insertions, 3 deletions

diff --git a/debian/README.gcj-native-transition b/debian/README.gcj-native-transition
new file mode 100644
index 0000000..d32c1b4
--- /dev/null
+++ b/debian/README.gcj-native-transition
@@ -0,0 +1,30 @@
+default-jdk-builddep transition
+===============================
+
+default-jdk-builddep was a package to provide helpers to compile
+class/jar files into native code, unfortunately its poorly chosen
+name lead to people thinking it was the "Right Thing" to
+Build-Depend on when maintaining a Java Package. This
+misunderstanding even got into the templates for AMs for reviewing
+New Maintainers (The T&SII follow up).
+
+These helper tools requires a special Java Development Kit and
+therefore on many architectures default-jdk-builddep would pull two
+full JDK.
+
+In order to end this confusion once and for all the Debian Java team
+decided to rename default-jdk-builddep to gcj-native-helper and
+reduce it to only pull the special JDK needed for native compilation.
+
+The replacement for default-jdk-builddep falls into one of two cases.
+If you create "gcj" packages (which contains jar files compiled into
+native shared libraries), default-jdk-builddep should be replaced by
+default-jdk AND gcj-native-helper. Otherwise you should replace it by
+default-jdk.
+
+If you are interested in the debate to do this rename, please have a
+look at:
+  * http://lists.debian.org/debian-java/2010/04/msg00070.html
+
+ -- Niels Thykier <niels@thykier.net>  Wed, 30 Jun 2010 22:55:00 +0200
+
diff --git a/debian/changelog b/debian/changelog
index cbb8108..64963b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,24 @@
+java-common (0.38) UNRELEASED; urgency=low
+
+  * Updated the description of gcj-native-helper and also the
+    previous changelog entry to clarify that gcj-native-helper
+    is only a partial replacement for default-jdk-builddep.
+    
+    Please see README.gcj-native-transition in the java-common
+    package for more information on the transition.
+  * Added missing Replaces/Conflicts for gcj-native-helper.
+  * Bumped Standards-Versions to 3.9.0 - no changes required.
+
+ -- Niels Thykier <niels@thykier.net>  Wed, 30 Jun 2010 22:05:13 +0200
+
 java-common (0.37) unstable; urgency=low
 
   * Updated and synced the Java FAQ.
     - contains a example of how to link with system javadocs.
     (Closes: #577164)
   * Renamed default-jdk-builddep to gcj-native-helper.
+    - Note gcj-native-helper is only a partial replacement for
+      default-jdk-builddep
   * Removed useless install files and moved the override files
     to a location where dh_lintian finds them.
   * Removed some unused overrides.
diff --git a/debian/control b/debian/control
index 00ace8a..cbec322 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Michael Koch <konqueror@gmx.de>, Matthias Klose <doko@debian.org>, To
  Niels Thykier <niels@thykier.net>
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, lynx
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-common
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-common/
@@ -74,9 +74,17 @@ Package: gcj-native-helper
 Architecture: any
 Depends: default-jdk (= ${binary:Version}), ${jdk:builddep}, ${misc:Depends}
 Provides: default-jdk-builddep
+Conflicts: default-jdk-builddep
+Replaces: default-jdk-builddep
 Description: Standard helper tools for creating gcj native packages
  This package points to the build dependencies used to build
  gcj native packages.
  .
- During the transition from default-jdk-builddep to gcj-native-helper,
- this package will also depend on default-jdk to avoid breakage.
+ Unlike default-jdk-builddep, this package only provides the
+ helpers to compile jar/class files into native code and not
+ a Java Development Kit (JDK). You do not need this package
+ unless you are compiling jar/class files to native code.
+ .
+ Note: During the transition from default-jdk-builddep to
+ gcj-native-helper, this package will also depend on
+ default-jdk to avoid breakage.
diff --git a/debian/java-common.docs b/debian/java-common.docs
new file mode 100644
index 0000000..1f359fe
--- /dev/null
+++ b/debian/java-common.docs
@@ -0,0 +1 @@
+debian/README.gcj-native-transition