[maven-jar-plugin] 15/33: New upstream release (2.3.2) Removed the patch 0001-remove-version-of-some-plugins.patch

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-jar-plugin.

commit ad08fd8c512f22bb26920bc8e93ada38833c0414
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 18 11:33:37 2013 +0000

    New upstream release (2.3.2)
    Removed the patch 0001-remove-version-of-some-plugins.patch
---
 debian/changelog                                   |  4 ++-
 debian/libmaven-jar-plugin-java.poms               | 14 ++++++-----
 debian/maven.rules                                 |  3 ++-
 .../0001-remove-version-of-some-plugins.patch      | 29 ----------------------
 debian/patches/series                              |  1 -
 5 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f64848a..46488cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-maven-jar-plugin (2.2-7) UNRELEASED; urgency=low
+maven-jar-plugin (2.3.2-1) unstable; urgency=low
 
   * Team upload.
+  * New upstream release
+    - Removed the patch 0001-remove-version-of-some-plugins.patch
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
     - Updated Standards-Version to 3.9.4 (no changes)
diff --git a/debian/libmaven-jar-plugin-java.poms b/debian/libmaven-jar-plugin-java.poms
index 31a0ccf..5ad70f2 100644
--- a/debian/libmaven-jar-plugin-java.poms
+++ b/debian/libmaven-jar-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 --no-parent --has-package-version
diff --git a/debian/maven.rules b/debian/maven.rules
index 4be060f..54e084e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -14,8 +14,9 @@
 # All elements much match before a rule can be applied
 # Example rule: match jar with groupid= junit, artifactid= junit
 # 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/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
+junit junit jar s/3\..*/3.x/
diff --git a/debian/patches/0001-remove-version-of-some-plugins.patch b/debian/patches/0001-remove-version-of-some-plugins.patch
deleted file mode 100644
index 4b83dae..0000000
--- a/debian/patches/0001-remove-version-of-some-plugins.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Tue, 23 Aug 2011 13:11:15 +0200
-Subject: [PATCH] remove version of some plugins
-
----
- pom.xml |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 8858059..c35581f 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -182,7 +182,6 @@ under the License.
-           <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-install-plugin</artifactId>
--            <version>2.2</version>
-             <executions>
-               <execution>
-                 <id>integration-test</id>
-@@ -207,7 +206,6 @@ under the License.
-           <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-invoker-plugin</artifactId>
--            <version>1.1</version>
-             <configuration>
-               <projectsDirectory>src/it</projectsDirectory>
-               <pomIncludes>
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b5dfd4a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-remove-version-of-some-plugins.patch

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