[maven-hpi-plugin] 04/05: Switch to using patch-queue for patches

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository maven-hpi-plugin.

commit 488fcdccf429c0cbd1c130d6c58b4310a2097fed
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 10:34:36 2013 +0100

    Switch to using patch-queue for patches
---
 .../patches/{build-tools.patch => 0001-build-tools.patch}  |   10 ++++++++++
 ...-archetype.patch => 0002-disable-jetty-archetype.patch} |   10 ++++++++++
 .../{openjdk6-fixup.patch => 0003-openjdk6-fixup.patch}    |   12 +++++++++++-
 debian/patches/series                                      |    6 +++---
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/debian/patches/build-tools.patch b/debian/patches/0001-build-tools.patch
similarity index 71%
rename from debian/patches/build-tools.patch
rename to debian/patches/0001-build-tools.patch
index ed0ddc1..73604ca 100644
--- a/debian/patches/build-tools.patch
+++ b/debian/patches/0001-build-tools.patch
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 12 Aug 2013 10:34:04 +0100
+Subject: build-tools
+
+---
+ pom.xml | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index 431b4af..bd3e2ef 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -263,6 +263,24 @@
diff --git a/debian/patches/disable-jetty-archetype.patch b/debian/patches/0002-disable-jetty-archetype.patch
similarity index 73%
rename from debian/patches/disable-jetty-archetype.patch
rename to debian/patches/0002-disable-jetty-archetype.patch
index a651248..a77665a 100644
--- a/debian/patches/disable-jetty-archetype.patch
+++ b/debian/patches/0002-disable-jetty-archetype.patch
@@ -1,3 +1,13 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 12 Aug 2013 10:34:04 +0100
+Subject: disable-jetty-archetype
+
+---
+ pom.xml | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index bd3e2ef..ab73de7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -36,6 +36,19 @@
diff --git a/debian/patches/openjdk6-fixup.patch b/debian/patches/0003-openjdk6-fixup.patch
similarity index 51%
rename from debian/patches/openjdk6-fixup.patch
rename to debian/patches/0003-openjdk6-fixup.patch
index 5697673..1e4002c 100644
--- a/debian/patches/openjdk6-fixup.patch
+++ b/debian/patches/0003-openjdk6-fixup.patch
@@ -1,6 +1,16 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 12 Aug 2013 10:34:04 +0100
+Subject: openjdk6-fixup
+
+---
+ src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
+index d551f28..d8c1f09 100644
 --- a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
 +++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
-@@ -645,9 +645,6 @@ public abstract class AbstractHpiMojo ex
+@@ -645,9 +645,6 @@ public abstract class AbstractHpiMojo extends AbstractJenkinsMojo {
              unArchiver.setDestDirectory(location);
              unArchiver.extract();
          }
diff --git a/debian/patches/series b/debian/patches/series
index 0c472bd..b541ed1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-build-tools.patch
-disable-jetty-archetype.patch
-openjdk6-fixup.patch
+0001-build-tools.patch
+0002-disable-jetty-archetype.patch
+0003-openjdk6-fixup.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-hpi-plugin.git