[maven-hpi-plugin] 03/05: New upstream release:

[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 be485813c0cc4154ad3e94fd4eaf496a66149eee
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 10:28:56 2013 +0100

    New upstream release:
    
    * New upstream release:
      - Refreshed patches.
---
 .gitignore                                   |    1 +
 debian/changelog                             |    3 ++-
 debian/patches/build-tools.patch             |   11 +++++------
 debian/patches/disable-jetty-archetype.patch |   10 ++++------
 debian/patches/openjdk6-fixup.patch          |    8 +++-----
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e4f244..2ca0ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ target
 .classpath
 .settings
 .project
+.pc
diff --git a/debian/changelog b/debian/changelog
index 685d772..e3d3b4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 maven-hpi-plugin (1.93-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release:
+    - Refreshed patches.
 
  -- James Page <james.page at ubuntu.com>  Mon, 12 Aug 2013 10:26:35 +0100
 
diff --git a/debian/patches/build-tools.patch b/debian/patches/build-tools.patch
index 56d4b6c..ed0ddc1 100644
--- a/debian/patches/build-tools.patch
+++ b/debian/patches/build-tools.patch
@@ -1,8 +1,6 @@
-Index: maven-hpi-plugin-debian/pom.xml
-===================================================================
---- maven-hpi-plugin-debian.orig/pom.xml	2012-01-11 00:14:52.082915848 +0100
-+++ maven-hpi-plugin-debian/pom.xml	2012-01-11 00:15:00.578971543 +0100
-@@ -223,5 +223,23 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -263,6 +263,24 @@
          </plugins>
        </build>
      </profile>
@@ -25,4 +23,5 @@ Index: maven-hpi-plugin-debian/pom.xml
 +      </dependencies>
 +    </profile>
    </profiles>
- </project>
+ 
+   <pluginRepositories>
diff --git a/debian/patches/disable-jetty-archetype.patch b/debian/patches/disable-jetty-archetype.patch
index cfb3cdc..a651248 100644
--- a/debian/patches/disable-jetty-archetype.patch
+++ b/debian/patches/disable-jetty-archetype.patch
@@ -1,9 +1,7 @@
-Index: maven-hpi-plugin-debian/pom.xml
-===================================================================
---- maven-hpi-plugin-debian.orig/pom.xml	2012-01-11 00:15:00.578971543 +0100
-+++ maven-hpi-plugin-debian/pom.xml	2012-01-11 00:15:06.187008642 +0100
-@@ -31,6 +31,19 @@
-     <plugins>
+--- a/pom.xml
++++ b/pom.xml
+@@ -36,6 +36,19 @@
+       </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-compiler-plugin</artifactId>
diff --git a/debian/patches/openjdk6-fixup.patch b/debian/patches/openjdk6-fixup.patch
index d3d63fc..5697673 100644
--- a/debian/patches/openjdk6-fixup.patch
+++ b/debian/patches/openjdk6-fixup.patch
@@ -1,8 +1,6 @@
-Index: maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
-===================================================================
---- maven-hpi-plugin-debian.orig/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java	2012-01-11 00:12:39.170051175 +0100
-+++ maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java	2012-01-11 00:13:03.486265884 +0100
-@@ -618,9 +618,6 @@
+--- 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
              unArchiver.setDestDirectory(location);
              unArchiver.extract();
          }

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