[pkg-java] r11851 - in trunk/doxia-maven-plugin/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2010-03-13 13:33:09 +0000 (Sat, 13 Mar 2010)
New Revision: 11851

Added:
   trunk/doxia-maven-plugin/debian/patches/0001-debianize-parent-pom-version.patch
Removed:
   trunk/doxia-maven-plugin/debian/patches/0001-add-version-to-clirr-maven-plugin.patch
Modified:
   trunk/doxia-maven-plugin/debian/changelog
   trunk/doxia-maven-plugin/debian/patches/series
Log:
* Remove old patch because maven-repo-helper handles it correctly now.
* Add new patch to fix parent pom version. (Closes: #573698)

Modified: trunk/doxia-maven-plugin/debian/changelog
===================================================================
--- trunk/doxia-maven-plugin/debian/changelog	2010-03-13 10:46:44 UTC (rev 11850)
+++ trunk/doxia-maven-plugin/debian/changelog	2010-03-13 13:33:09 UTC (rev 11851)
@@ -1,3 +1,10 @@
+doxia-maven-plugin (1.1.1-3) unstable; urgency=low
+
+  * Remove old patch because maven-repo-helper handles it correctly now.
+  * Add new patch to fix parent pom version. (Closes: #573698)
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 13 Mar 2010 14:30:02 +0100
+
 doxia-maven-plugin (1.1.1-2) unstable; urgency=low
 
   * Add myself to Uploaders.

Deleted: trunk/doxia-maven-plugin/debian/patches/0001-add-version-to-clirr-maven-plugin.patch
===================================================================
--- trunk/doxia-maven-plugin/debian/patches/0001-add-version-to-clirr-maven-plugin.patch	2010-03-13 10:46:44 UTC (rev 11850)
+++ trunk/doxia-maven-plugin/debian/patches/0001-add-version-to-clirr-maven-plugin.patch	2010-03-13 13:33:09 UTC (rev 11851)
@@ -1,21 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sat, 17 Oct 2009 23:36:53 +0200
-Subject: [PATCH] add version to clirr-maven-plugin
-
----
- pom.xml |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index dbc7c40..d4c3351 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -150,6 +150,7 @@ under the License.
-       <plugin>
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>clirr-maven-plugin</artifactId>
-+	<version>2.2.2</version>
-         <configuration>
-           <comparisonVersion>1.1</comparisonVersion>
-           <excludes>
--- 

Added: trunk/doxia-maven-plugin/debian/patches/0001-debianize-parent-pom-version.patch
===================================================================
--- trunk/doxia-maven-plugin/debian/patches/0001-debianize-parent-pom-version.patch	                        (rev 0)
+++ trunk/doxia-maven-plugin/debian/patches/0001-debianize-parent-pom-version.patch	2010-03-13 13:33:09 UTC (rev 11851)
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 13 Mar 2010 14:28:30 +0100
+Subject: [PATCH] debianize parent pom version
+
+---
+ pom.xml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index dbc7c40..72f1a1d 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -25,7 +25,7 @@ under the License.
+   <parent>
+     <groupId>org.apache.maven.doxia</groupId>
+     <artifactId>doxia</artifactId>
+-    <version>1.1.1</version>
++    <version>debian</version>
+     <relativePath>../pom.xml</relativePath>
+   </parent>
+ 
+-- 

Modified: trunk/doxia-maven-plugin/debian/patches/series
===================================================================
--- trunk/doxia-maven-plugin/debian/patches/series	2010-03-13 10:46:44 UTC (rev 11850)
+++ trunk/doxia-maven-plugin/debian/patches/series	2010-03-13 13:33:09 UTC (rev 11851)
@@ -1 +1 @@
-0001-add-version-to-clirr-maven-plugin.patch
+0001-debianize-parent-pom-version.patch