[pkg-java] r10832 - in trunk/plexus-cdc/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Oct 15 21:40:00 UTC 2009
Author: drazzib
Date: 2009-10-15 21:40:00 +0000 (Thu, 15 Oct 2009)
New Revision: 10832
Added:
trunk/plexus-cdc/debian/README.source
Modified:
trunk/plexus-cdc/debian/changelog
trunk/plexus-cdc/debian/control
trunk/plexus-cdc/debian/patches/qdox1_9.patch
Log:
* Fix FTBFS with new QDox 1.9.2 (Closes: 545667)
- Update qdox_1.9 patch for QDox 1.9.2
"JavaDocBuilder doesn't implement javaCache any longer"
* Add myself to Uploaders
* Bump Standards-Version to 3.8.3:
- Add debian/README.source to describe patch system
Added: trunk/plexus-cdc/debian/README.source
===================================================================
--- trunk/plexus-cdc/debian/README.source (rev 0)
+++ trunk/plexus-cdc/debian/README.source 2009-10-15 21:40:00 UTC (rev 10832)
@@ -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-cdc/debian/changelog
===================================================================
--- trunk/plexus-cdc/debian/changelog 2009-10-15 18:43:48 UTC (rev 10831)
+++ trunk/plexus-cdc/debian/changelog 2009-10-15 21:40:00 UTC (rev 10832)
@@ -1,3 +1,14 @@
+plexus-cdc (1.0~alpha14-4) unstable; urgency=low
+
+ * Fix FTBFS with new QDox 1.9.2 (Closes: 545667)
+ - Update qdox_1.9 patch for QDox 1.9.2
+ "JavaDocBuilder doesn't implement javaCache any longer"
+ * Add myself to Uploaders
+ * Bump Standards-Version to 3.8.3:
+ - Add debian/README.source to describe patch system
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 15 Oct 2009 23:33:57 +0200
+
plexus-cdc (1.0~alpha14-3) unstable; urgency=low
* Upload to unstable.
Modified: trunk/plexus-cdc/debian/control
===================================================================
--- trunk/plexus-cdc/debian/control 2009-10-15 18:43:48 UTC (rev 10831)
+++ trunk/plexus-cdc/debian/control 2009-10-15 21:40:00 UTC (rev 10832)
@@ -2,12 +2,12 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk
Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
libplexus-containers-java, libplexus-utils-java,
libslf4j-java, libjdom1-java, libqdox-java
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-cdc
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-cdc/
Homepage: http://plexus.codehaus.org/guides/quick-start/component-descriptor-creator.html
Modified: trunk/plexus-cdc/debian/patches/qdox1_9.patch
===================================================================
--- trunk/plexus-cdc/debian/patches/qdox1_9.patch 2009-10-15 18:43:48 UTC (rev 10831)
+++ trunk/plexus-cdc/debian/patches/qdox1_9.patch 2009-10-15 21:40:00 UTC (rev 10832)
@@ -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-14
--- a/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
+++ b/src/main/java/org/codehaus/plexus/cdc/PlexusDefaultComponentGleaner.java
+@@ -35,8 +35,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;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirement;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirementList;
+@@ -92,7 +92,7 @@
+ // ComponentGleaner Implementation
+ // ----------------------------------------------------------------------
+
+- public ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
++ public ComponentDescriptor glean( JavaDocBuilder classCache, JavaClass javaClass )
+ throws ComponentDescriptorCreatorException
+ {
+ DocletTag tag = javaClass.getTagByName( PLEXUS_COMPONENT_TAG );
@@ -274,7 +274,7 @@
String fqn = ifc.getFullyQualifiedName();
@@ -18,6 +44,15 @@
fqn = pkg + "." + fqn;
}
+@@ -335,7 +335,7 @@
+ return role;
+ }
+
+- private void findRequirements( JavaClassCache classCache, ComponentDescriptor componentDescriptor,
++ private void findRequirements( JavaDocBuilder classCache, ComponentDescriptor componentDescriptor,
+ JavaClass javaClass )
+ {
+ JavaField[] fields = javaClass.getFields();
@@ -445,7 +445,7 @@
JavaClass roleClass = classCache.getClassByName( role );
@@ -29,6 +64,25 @@
}
--- a/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
+++ b/src/main/java/org/codehaus/plexus/cdc/gleaner/QDoxComponentGleaner.java
+@@ -35,8 +35,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;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirement;
+ import org.codehaus.plexus.component.repository.cdc.ComponentRequirementList;
+@@ -91,7 +91,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 );
@@ -271,7 +271,7 @@
String fqn = ifc.getFullyQualifiedName();
@@ -47,6 +101,15 @@
fqn = pkg + "." + fqn;
}
+@@ -331,7 +331,7 @@
+ return role;
+ }
+
+- private void findRequirements( JavaClassCache classCache, ComponentDescriptor componentDescriptor,
++ private void findRequirements( JavaDocBuilder classCache, ComponentDescriptor componentDescriptor,
+ JavaClass javaClass )
+ {
+ JavaField[] fields = javaClass.getFields();
@@ -441,7 +441,7 @@
JavaClass roleClass = classCache.getClassByName( role );
@@ -63,3 +126,42 @@
-}
\ No newline at end of file
+}
+--- a/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/ComponentGleaner.java
+@@ -25,7 +25,7 @@
+ */
+
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
++import com.thoughtworks.qdox.JavaDocBuilder;
+ import org.codehaus.plexus.cdc.gleaner.SourceComponentGleaner;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+
+@@ -39,6 +39,6 @@
+ {
+ String ROLE = ComponentGleaner.class.getName();
+
+- ComponentDescriptor glean( JavaClassCache classCache, JavaClass javaClass )
++ ComponentDescriptor glean( JavaDocBuilder classCache, JavaClass javaClass )
+ throws ComponentDescriptorCreatorException;
+ }
+--- a/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java
++++ b/src/main/java/org/codehaus/plexus/cdc/gleaner/SourceComponentGleaner.java
+@@ -17,7 +17,7 @@
+ package org.codehaus.plexus.cdc.gleaner;
+
+ import com.thoughtworks.qdox.model.JavaClass;
+-import com.thoughtworks.qdox.model.JavaClassCache;
++import com.thoughtworks.qdox.JavaDocBuilder;
+ import org.codehaus.plexus.cdc.gleaner.ComponentGleanerException;
+ import org.codehaus.plexus.component.repository.cdc.ComponentDescriptor;
+
+@@ -30,5 +30,5 @@
+ {
+ String ROLE = SourceComponentGleaner.class.getName();
+
+- ComponentDescriptor glean(JavaClassCache classCache, JavaClass javaClass) throws ComponentGleanerException;
+-}
+\ No newline at end of file
++ ComponentDescriptor glean(JavaDocBuilder classCache, JavaClass javaClass) throws ComponentGleanerException;
++}
More information about the pkg-java-commits
mailing list