diff -u gcc-4.4-4.4.0/debian/changelog gcc-4.4-4.4.0/debian/changelog
--- gcc-4.4-4.4.0/debian/changelog
+++ gcc-4.4-4.4.0/debian/changelog
@@ -1,3 +1,11 @@
+gcc-4.4 (4.4.0-5ubuntu2) karmic; urgency=low
+
+  * make gjdoc --version use Configuration class instead of version.properties
+    (LP: #385682)
+    - add debian/patches/gjdoc-version.diff
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 10 Jun 2009 21:59:33 +0200
+
 gcc-4.4 (4.4.0-5ubuntu1) karmic; urgency=low
 
   * Merge with Debian; remaining changes:
diff -u gcc-4.4-4.4.0/debian/rules.patch gcc-4.4-4.4.0/debian/rules.patch
--- gcc-4.4-4.4.0/debian/rules.patch
+++ gcc-4.4-4.4.0/debian/rules.patch
@@ -207,6 +207,10 @@
 endif
 
 
+# oatch for lp: #385682
+debian_patches += gjdoc-version
+
+
 series_stamp = $(stampdir)/02-series-stamp
 series: $(series_stamp)
 $(series_stamp):
only in patch2:
unchanged:
--- gcc-4.4-4.4.0.orig/debian/patches/gjdoc-version.diff
+++ gcc-4.4-4.4.0/debian/patches/gjdoc-version.diff
@@ -0,0 +1,11 @@
+--- a/src/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java.orig	2009-06-10 21:58:01.000000000 +0200
++++ b/src/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java	2009-06-10 21:58:03.000000000 +0200
+@@ -1128,7 +1128,7 @@
+       //--- Show version and exit if requested by user
+ 
+       if (option_showVersion) {
+-        System.out.println("gjdoc " + getGjdocVersion());
++        System.out.println("gjdoc " + gnu.classpath.Configuration.CLASSPATH_VERSION);
+         System.exit(0);
+       }
+