[pkg-java] r9389 - in trunk/axis/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2009-07-24 16:29:27 +0000 (Fri, 24 Jul 2009)
New Revision: 9389

Added:
   trunk/axis/debian/patches/02-gcj-4.4.patch
Modified:
   trunk/axis/debian/
   trunk/axis/debian/changelog
Log:
Add patch for gcj-4.4: do not build function clearCache() which is not used
anyway. (Closes: #531995)


Property changes on: trunk/axis/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/axis/debian/changelog
===================================================================
--- trunk/axis/debian/changelog	2009-07-24 11:13:01 UTC (rev 9388)
+++ trunk/axis/debian/changelog	2009-07-24 16:29:27 UTC (rev 9389)
@@ -1,10 +1,15 @@
-axis (1.4-6) UNRELEASED; urgency=low
+axis (1.4-6) unstable; urgency=low
 
+  [ Matthias Klose ]
   * axis: Depend on default-jre-headless.
   * Build using java-gcj (axis is not 1.6 source compatible).
 
- -- Matthias Klose <doko at debian.org>  Thu, 31 Jul 2008 10:16:02 +0000
+  [ Torsten Werner ]
+  * Add patch for gcj-4.4: do not build function clearCache() which is not used
+    anyway. (Closes: #531995)
 
+ -- Torsten Werner <twerner at nina.lan>  Fri, 24 Jul 2009 18:27:24 +0200
+
 axis (1.4-5) unstable; urgency=low
 
   * Added missing packages to Depends of libaxis-java.

Added: trunk/axis/debian/patches/02-gcj-4.4.patch
===================================================================
--- trunk/axis/debian/patches/02-gcj-4.4.patch	                        (rev 0)
+++ trunk/axis/debian/patches/02-gcj-4.4.patch	2009-07-24 16:29:27 UTC (rev 9389)
@@ -0,0 +1,16 @@
+diff -Nur -x '*.orig' -x '*~' axis-1.4/src/org/apache/axis/i18n/ProjectResourceBundle.java axis-1.4.new/src/org/apache/axis/i18n/ProjectResourceBundle.java
+--- axis-1.4/src/org/apache/axis/i18n/ProjectResourceBundle.java	2006-04-23 03:57:27.000000000 +0200
++++ axis-1.4.new/src/org/apache/axis/i18n/ProjectResourceBundle.java	2009-07-24 18:24:32.000000000 +0200
+@@ -360,10 +360,12 @@
+     /**
+      * Clears the internal cache
+      */
++    /*
+     public static void clearCache()
+     {
+         bundleCache.clear();
+     }
++    */
+     
+     public String toString() {
+         return resourceName;