Bug#591127: plexus-component-metadata: FTBFS: maven errors

[Miguel Landaeta]

tags 591127 + patch
thanks

Please consider the attached patch to fix this bug.

-- 
Miguel Landaeta, miguel at miguel.cc
secure email with PGP 0x7D8967E9 available at http://keyserver.pgp.com/
"Faith means not wanting to know what is true." -- Nietzsche
-------------- next part --------------
diff -Nru plexus-component-metadata-1.0~beta3.0.7/debian/changelog plexus-component-metadata-1.0~beta3.0.7/debian/changelog
--- plexus-component-metadata-1.0~beta3.0.7/debian/changelog	2010-08-03 21:19:37.000000000 -0430
+++ plexus-component-metadata-1.0~beta3.0.7/debian/changelog	2010-08-03 21:12:01.000000000 -0430
@@ -1,3 +1,13 @@
+plexus-component-metadata (1.0~beta3.0.7-4) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Convert source package to 3.0 (quilt) format and drop unnecessary
+    Build-Depends on quilt.
+  * Bump Standards-Versions to 3.9.1. No changes were required.
+  * Fix dependency declaration on jdom in POM file. (Closes: #591127).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 03 Aug 2010 21:11:54 -0430
+
 plexus-component-metadata (1.0~beta3.0.7-3) unstable; urgency=low
 
   * Fix FTBFS with new QDox 1.9.2 (Closes: #545658)
diff -Nru plexus-component-metadata-1.0~beta3.0.7/debian/control plexus-component-metadata-1.0~beta3.0.7/debian/control
--- plexus-component-metadata-1.0~beta3.0.7/debian/control	2010-08-03 21:19:37.000000000 -0430
+++ plexus-component-metadata-1.0~beta3.0.7/debian/control	2010-08-03 21:11:45.000000000 -0430
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 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: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
 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.3
+Standards-Version: 3.9.1
 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
diff -Nru plexus-component-metadata-1.0~beta3.0.7/debian/patches/fix_pom.patch plexus-component-metadata-1.0~beta3.0.7/debian/patches/fix_pom.patch
--- plexus-component-metadata-1.0~beta3.0.7/debian/patches/fix_pom.patch	1969-12-31 20:00:00.000000000 -0400
+++ plexus-component-metadata-1.0~beta3.0.7/debian/patches/fix_pom.patch	2010-08-03 21:13:06.000000000 -0430
@@ -0,0 +1,17 @@
+Description: Fix POM metadata
+ The ant-maven helper is not doing the substitution specified in maven.rules.
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: not-needed
+Last-Update: 2010-08-03
+
+--- plexus-component-metadata-1.0~beta3.0.7.orig/pom.xml
++++ plexus-component-metadata-1.0~beta3.0.7/pom.xml
+@@ -39,7 +39,7 @@
+       <artifactId>qdox</artifactId>
+     </dependency>
+     <dependency>
+-      <groupId>jdom</groupId>
++      <groupId>org.jdom</groupId>
+       <artifactId>jdom</artifactId>
+     </dependency>
+     <dependency>
diff -Nru plexus-component-metadata-1.0~beta3.0.7/debian/patches/series plexus-component-metadata-1.0~beta3.0.7/debian/patches/series
--- plexus-component-metadata-1.0~beta3.0.7/debian/patches/series	2010-08-03 21:19:37.000000000 -0430
+++ plexus-component-metadata-1.0~beta3.0.7/debian/patches/series	2010-08-03 21:14:24.000000000 -0430
@@ -1 +1,2 @@
 qdox1_9.patch
+fix_pom.patch
diff -Nru plexus-component-metadata-1.0~beta3.0.7/debian/rules plexus-component-metadata-1.0~beta3.0.7/debian/rules
--- plexus-component-metadata-1.0~beta3.0.7/debian/rules	2010-08-03 21:19:37.000000000 -0430
+++ plexus-component-metadata-1.0~beta3.0.7/debian/rules	2010-08-03 21:05:55.000000000 -0430
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
diff -Nru plexus-component-metadata-1.0~beta3.0.7/debian/source/format plexus-component-metadata-1.0~beta3.0.7/debian/source/format
--- plexus-component-metadata-1.0~beta3.0.7/debian/source/format	1969-12-31 20:00:00.000000000 -0400
+++ plexus-component-metadata-1.0~beta3.0.7/debian/source/format	2010-08-03 20:35:16.000000000 -0430
@@ -0,0 +1 @@
+3.0 (quilt)