[pkg-java] r10852 - in trunk/plexus-component-metadata/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-10-19 20:02:08 +0000 (Mon, 19 Oct 2009)
New Revision: 10852

Added:
   trunk/plexus-component-metadata/debian/README.source
Modified:
   trunk/plexus-component-metadata/debian/changelog
   trunk/plexus-component-metadata/debian/compat
   trunk/plexus-component-metadata/debian/control
   trunk/plexus-component-metadata/debian/patches/qdox1_9.patch
Log:
* Fix FTBFS with new QDox 1.9.2 (Closes: #545658)
  - Update qdox_1.9 patch for QDox 1.9.2
    "JavaDocBuilder doesn't implement javaCache any longer"
* Add myself to Uploaders
* Bump debhelper compat level to 7
* Bump Standards-Version to 3.8.3:
  - Add debian/README.source to describe patch system

Added: trunk/plexus-component-metadata/debian/README.source
===================================================================
--- trunk/plexus-component-metadata/debian/README.source	                        (rev 0)
+++ trunk/plexus-component-metadata/debian/README.source	2009-10-19 20:02:08 UTC (rev 10852)
@@ -0,0 +1,6 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+

Modified: trunk/plexus-component-metadata/debian/changelog
===================================================================
--- trunk/plexus-component-metadata/debian/changelog	2009-10-19 17:08:47 UTC (rev 10851)
+++ trunk/plexus-component-metadata/debian/changelog	2009-10-19 20:02:08 UTC (rev 10852)
@@ -1,3 +1,15 @@
+plexus-component-metadata (1.0~beta3.0.7-3) unstable; urgency=low
+
+  * Fix FTBFS with new QDox 1.9.2 (Closes: #545658)
+    - Update qdox_1.9 patch for QDox 1.9.2
+      "JavaDocBuilder doesn't implement javaCache any longer"
+  * Add myself to Uploaders
+  * Bump debhelper compat level to 7
+  * Bump Standards-Version to 3.8.3:
+    - Add debian/README.source to describe patch system
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 19 Oct 2009 22:00:41 +0200
+
 plexus-component-metadata (1.0~beta3.0.7-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/plexus-component-metadata/debian/compat
===================================================================
--- trunk/plexus-component-metadata/debian/compat	2009-10-19 17:08:47 UTC (rev 10851)
+++ trunk/plexus-component-metadata/debian/compat	2009-10-19 20:02:08 UTC (rev 10852)
@@ -1 +1 @@
-6
+7

Modified: trunk/plexus-component-metadata/debian/control
===================================================================
--- trunk/plexus-component-metadata/debian/control	2009-10-19 17:08:47 UTC (rev 10851)
+++ trunk/plexus-component-metadata/debian/control	2009-10-19 20:02:08 UTC (rev 10852)
@@ -2,13 +2,13 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), default-jdk, quilt
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk, quilt
 Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
  junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
  libplexus-containers-java, libplexus-utils-java, libqdox-java, 
  libjdom1-java, libmaven2-core-java, libplexus-cli-java, libcommons-cli-java, libasm3-java
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-component-metadata
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-component-metadata/
 Homepage: http://plexus.codehaus.org

Modified: trunk/plexus-component-metadata/debian/patches/qdox1_9.patch
===================================================================
--- trunk/plexus-component-metadata/debian/patches/qdox1_9.patch	2009-10-19 17:08:47 UTC (rev 10851)
+++ trunk/plexus-component-metadata/debian/patches/qdox1_9.patch	2009-10-19 20:02:08 UTC (rev 10852)
@@ -1,5 +1,31 @@
+Description: Fix build with Debian QDox version
+ Updated patch for QDox 1.9.2 as JavaDocBuilder doesn't
+ implement javaCache any longer.
+ <http://jira.codehaus.org/browse/QDOX-148>
+Author: Ludovic Claude <ludovic.claude at laposte.net>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-10-19
 --- a/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
 +++ b/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java
+@@ -47,8 +47,8 @@
+ 
+ import com.thoughtworks.qdox.model.DocletTag;
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
+ import com.thoughtworks.qdox.model.JavaField;
++import com.thoughtworks.qdox.JavaDocBuilder;
+ 
+ /**
+  * A source component gleaner which uses QDox to discover Javadoc annotations.
+@@ -88,7 +88,7 @@
+     // ComponentGleaner Implementation
+     // ----------------------------------------------------------------------
+ 
+-    public ComponentDescriptor<?> glean( JavaClassCache classCache, JavaClass javaClass )
++    public ComponentDescriptor<?> glean( JavaDocBuilder classCache, JavaClass javaClass )
+         throws ComponentGleanerException
+     {
+         DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG );
 @@ -268,7 +268,7 @@
  
              String fqn = ifc.getFullyQualifiedName();
@@ -18,6 +44,15 @@
  
                      fqn = pkg + "." + fqn;
                  }
+@@ -330,7 +330,7 @@
+         return role;
+     }
+ 
+-    private void findRequirements( JavaClassCache classCache, ComponentDescriptor<?> componentDescriptor,
++    private void findRequirements( JavaDocBuilder classCache, ComponentDescriptor<?> componentDescriptor,
+                                    JavaClass javaClass )
+     {
+         JavaField[] fields = javaClass.getFields();
 @@ -444,9 +444,9 @@
  
                  JavaClass roleClass = classCache.getClassByName( role );
@@ -37,3 +72,24 @@
 -}
 \ No newline at end of file
 +}
+--- a/src/main/java/org/codehaus/plexus/metadata/gleaner/SourceComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/metadata/gleaner/SourceComponentGleaner.java
+@@ -19,7 +19,7 @@
+ import org.codehaus.plexus.component.repository.ComponentDescriptor;
+ 
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
++import com.thoughtworks.qdox.JavaDocBuilder;
+ 
+ /**
+  * Interface for component gleaners which glean off of source code.
+@@ -30,6 +30,6 @@
+ {
+     String ROLE = SourceComponentGleaner.class.getName();
+ 
+-    ComponentDescriptor<?> glean(JavaClassCache classCache, JavaClass javaClass) 
++    ComponentDescriptor<?> glean(JavaDocBuilder classCache, JavaClass javaClass) 
+         throws ComponentGleanerException;
+-}
+\ No newline at end of file
++}