[pkg-java] r9855 - in trunk/libcommons-attributes-java/debian: . patches

[Damien Raude-Morvan]

Author: drazzib-guest
Date: 2009-08-09 16:45:43 +0000 (Sun, 09 Aug 2009)
New Revision: 9855

Added:
   trunk/libcommons-attributes-java/debian/patches/qdox_1.9.diff
Modified:
   trunk/libcommons-attributes-java/debian/changelog
   trunk/libcommons-attributes-java/debian/control
   trunk/libcommons-attributes-java/debian/patches/series
Log:
[libcommons-attributes-java]

  * Add myself as Uploaders
  * Add new qdox_1.9.diff patch to fix compatibility with QDox 1.9
    (Closes: #540682)
  * Build-Depends on default-jdk instead of default-jdk-builddep
    since we don't build a native GCJ package.
  * Depends on default-jre-headless



Modified: trunk/libcommons-attributes-java/debian/changelog
===================================================================
--- trunk/libcommons-attributes-java/debian/changelog	2009-08-09 15:53:56 UTC (rev 9854)
+++ trunk/libcommons-attributes-java/debian/changelog	2009-08-09 16:45:43 UTC (rev 9855)
@@ -1,3 +1,14 @@
+libcommons-attributes-java (2.2-6) unstable; urgency=low
+
+  * Add myself as Uploaders
+  * Add new qdox_1.9.diff patch to fix compatibility with QDox 1.9
+    (Closes: #540682)
+  * Build-Depends on default-jdk instead of default-jdk-builddep
+    since we don't build a native GCJ package.
+  * Depends on default-jre-headless
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Sun, 09 Aug 2009 18:40:16 +0200
+
 libcommons-attributes-java (2.2-5) unstable; urgency=low
 
   * Change Maintainer: Debian Java Maintainers.

Modified: trunk/libcommons-attributes-java/debian/control
===================================================================
--- trunk/libcommons-attributes-java/debian/control	2009-08-09 15:53:56 UTC (rev 9854)
+++ trunk/libcommons-attributes-java/debian/control	2009-08-09 16:45:43 UTC (rev 9855)
@@ -2,8 +2,8 @@
 Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk-builddep, libqdox-java,
+Uploaders: Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, libqdox-java,
  quilt
 Standards-Version: 3.8.2
 Homepage: http://commons.apache.org/attributes/
@@ -12,7 +12,7 @@
 
 Package: libcommons-attributes-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java1-runtime | java2-runtime
 Description: adds C#/.Net-style attributes to Java code
  The Apache Jakarta Commons Attributes library enables Java programmers
  to use C#/.Net-style attributes in their code.

Added: trunk/libcommons-attributes-java/debian/patches/qdox_1.9.diff
===================================================================
--- trunk/libcommons-attributes-java/debian/patches/qdox_1.9.diff	                        (rev 0)
+++ trunk/libcommons-attributes-java/debian/patches/qdox_1.9.diff	2009-08-09 16:45:43 UTC (rev 9855)
@@ -0,0 +1,40 @@
+Description: Fix compatibility with QDox 1.9
+ "
+  In both JavaClass and JavaSource the getPackage() returns an object of
+  type JavaPackage instead of a String. To get the same result as before
+  use getPackage().getName().
+ "
+ <http://qdox.codehaus.org/upgrade.html>
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Last-Update: 2009-08-09
+--- a/compiler/src/java/org/apache/commons/attributes/compiler/AttributeCompiler.java
++++ b/compiler/src/java/org/apache/commons/attributes/compiler/AttributeCompiler.java
+@@ -39,6 +39,7 @@
+ import com.thoughtworks.qdox.model.JavaMethod;
+ import com.thoughtworks.qdox.model.DocletTag;
+ import com.thoughtworks.qdox.model.JavaParameter;
++import com.thoughtworks.qdox.model.JavaPackage;
+ 
+ 
+ /**
+@@ -241,9 +242,11 @@
+         String packageName = null;
+         String className = null;
+         
+-        packageName = javaClass.getPackage ();
+-        if (packageName == null) {
++        JavaPackage packagez = javaClass.getPackage();
++        if (packagez == null || packagez.getName() == null) {
+             packageName = "";
++        } else {
++            packageName = packagez.getName();
+         }
+         
+         if (javaClass.isInner ()) {
+@@ -523,4 +526,4 @@
+         }
+         return false;
+     }
+-}
+\ No newline at end of file
++}

Modified: trunk/libcommons-attributes-java/debian/patches/series
===================================================================
--- trunk/libcommons-attributes-java/debian/patches/series	2009-08-09 15:53:56 UTC (rev 9854)
+++ trunk/libcommons-attributes-java/debian/patches/series	2009-08-09 16:45:43 UTC (rev 9855)
@@ -1,2 +1,3 @@
 build.diff
 jar-target.diff
+qdox_1.9.diff