The following commit has been merged in the master branch:
commit 8bd37568a9c2577d19a980339565310658482ece
Author: James Page <james.p...@ubuntu.com>
Date:   Wed Jan 25 10:34:52 2012 +0000

    New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 22aa37a..d77e20b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 maven-hpi-plugin (1.79-1) unstable; urgency=low
 
   * Initial Debian release (Closes: #634656)
+  * New upstream release.
 
- -- James Page <james.p...@ubuntu.com>  Mon, 09 Jan 2012 22:50:22 +0100
+ -- James Page <james.p...@ubuntu.com>  Wed, 25 Jan 2012 10:34:30 +0000
 
 maven-hpi-plugin (1.71-0ubuntu1) oneiric; urgency=low
 
diff --git a/debian/libmaven-hpi-plugin-java.poms 
b/debian/libmaven-hpi-plugin-java.poms
index d38e9f0..5ad70f2 100644
--- a/debian/libmaven-hpi-plugin-java.poms
+++ b/debian/libmaven-hpi-plugin-java.poms
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, 
mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -11,16 +13,16 @@
 #   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 #      during a clean operation with mh_cleanpom or mh_installpom
 #   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
+#      it will be installed when using the command mh_install. [mh_install]
 #   --java-lib: install the jar into /usr/share/java to comply with Debian
 #      packaging guidelines
 #   --usj-name=<name>: name to use when installing the library in 
/usr/share/java
 #   --usj-version=<version>: version to use when installing the library in 
/usr/share/java
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
 #   --classifier=<classifier>: Optional, the classifier for the jar. Empty by 
default.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To 
use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to 
be installed.
+#     Empty by default. [mh_install]
 #
-pom.xml --has-package-version --no-parent
+pom.xml --no-parent --has-package-version
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index 32946af..1ecfe92 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -1,4 +1,5 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
 # Format of this file is:
 # [group] [artifact] [type] [version] [classifier] [scope]
 # where each element can be either
@@ -11,12 +12,8 @@
 # All elements much match before a rule can be applied
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., this dependency is then removed
-# from the POM
+# from the POM before mvn clean is called
 #   junit junit jar s/3\\..*/3.x/
 
-org.apache.maven.plugins maven-archetype-plugin * * * *
-org.apache.maven.wagon wagon-ssh * * * *
-org.mortbay.jetty maven-jetty-plugin * * * *
-org.jvnet.maven-jellydoc-plugin maven-jellydoc-plugin * * * *
 org.apache.maven.plugins maven-antrun-plugin * * * *
 org.apache.maven.plugins maven-plugin-plugin * * * *
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 62ce934..e17b8c6 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -16,5 +16,5 @@
 
 org.apache.maven.plugins maven-archetype-plugin * * * *
 org.apache.maven.wagon wagon-ssh * * * *
-org.mortbay.jetty maven-jetty-plugin * * * *
 org.jvnet.maven-jellydoc-plugin maven-jellydoc-plugin * * * *
+org.mortbay.jetty maven-jetty-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index 94145c2..40d1d22 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -3,4 +3,3 @@
 # maven.test.skip=true
 maven.compiler.source=1.6
 maven.compiler.target=1.6
-maven.compiler.verbose=true
diff --git a/debian/maven.rules b/debian/maven.publishedRules
similarity index 75%
copy from debian/maven.rules
copy to debian/maven.publishedRules
index efc4c77..822f087 100644
--- a/debian/maven.rules
+++ b/debian/maven.publishedRules
@@ -1,4 +1,5 @@
-# Maven rules - transform Maven dependencies and plugins
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
 # Format of this file is:
 # [group] [artifact] [type] [version] [classifier] [scope]
 # where each element can be either
@@ -16,7 +17,3 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
 
-junit junit jar s/3\..*/3.x/ * *
-s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ jar s/.*/debian/ * *
-s/ant/org.apache.ant/ * * s/.*/debian/ * *
-org.kohsuke.stapler maven-stapler-plugin * s/.*/1.16/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index efc4c77..20af469 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,6 +17,8 @@
 #   junit junit jar s/3\\..*/3.x/
 
 junit junit jar s/3\..*/3.x/ * *
+net.java.sezpoz sezpoz jar s/.*/debian/ * *
+org.codehaus.plexus plexus-interactivity-api jar s/.*/debian/ * *
 s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ jar s/.*/debian/ * *
-s/ant/org.apache.ant/ * * s/.*/debian/ * *
 org.kohsuke.stapler maven-stapler-plugin * s/.*/1.16/ * *
+s/ant/org.apache.ant/ * * s/.*/debian/ * *
diff --git a/debian/patches/build-tools.patch b/debian/patches/build-tools.patch
index 96c2729..56d4b6c 100644
--- a/debian/patches/build-tools.patch
+++ b/debian/patches/build-tools.patch
@@ -1,7 +1,7 @@
 Index: maven-hpi-plugin-debian/pom.xml
 ===================================================================
---- maven-hpi-plugin-debian.orig/pom.xml       2012-01-09 22:49:16.277119338 
+0100
-+++ maven-hpi-plugin-debian/pom.xml    2012-01-09 22:49:21.917134746 +0100
+--- 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 @@
          </plugins>
        </build>
diff --git a/debian/patches/disable-jetty-archetype.patch 
b/debian/patches/disable-jetty-archetype.patch
index acf4692..cfb3cdc 100644
--- a/debian/patches/disable-jetty-archetype.patch
+++ b/debian/patches/disable-jetty-archetype.patch
@@ -1,7 +1,7 @@
 Index: maven-hpi-plugin-debian/pom.xml
 ===================================================================
---- maven-hpi-plugin-debian.orig/pom.xml       2012-01-09 22:49:21.917134746 
+0100
-+++ maven-hpi-plugin-debian/pom.xml    2012-01-09 22:49:22.981137653 +0100
+--- 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>
        <plugin>
diff --git a/debian/patches/openjdk6-fixup.patch 
b/debian/patches/openjdk6-fixup.patch
index 9185912..d3d63fc 100644
--- a/debian/patches/openjdk6-fixup.patch
+++ b/debian/patches/openjdk6-fixup.patch
@@ -1,7 +1,7 @@
 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-09 22:49:16.189119097 +0100
-+++ 
maven-hpi-plugin-debian/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java
 2012-01-09 22:49:24.025140505 +0100
+--- 
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 @@
              unArchiver.setDestDirectory(location);
              unArchiver.extract();

-- 
maven-hpi-plugin packaging

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to