[maven2] 82/87: Updated the dependency on libmaven-shade-plugin-java to 1.7.1 debian/rules: Modified the clean target to allow rebuilds

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven2.

commit 97a61885d0d2f918044f6243e85172cb69a7500a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 2 14:35:17 2013 +0000

    Updated the dependency on libmaven-shade-plugin-java to 1.7.1
    debian/rules: Modified the clean target to allow rebuilds
---
 debian/changelog   |  8 ++++++++
 debian/control     | 11 ++++++-----
 debian/maven.rules |  1 +
 debian/rules       |  4 +++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 279f484..96c1531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven2 (2.2.1-19) unstable; urgency=low
+
+  * Team upload
+  * Updated the dependency on libmaven-shade-plugin-java to 1.7.1
+  * debian/rules: Modified the clean target to allow rebuilds
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 02 Dec 2013 15:34:06 +0100
+
 maven2 (2.2.1-18) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index f2ef78e..b08fbf1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
- Torsten Werner <twerner at debian.org>
+ Torsten Werner <twerner at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
 Build-Depends-Indep: ant-optional,
                      junit,
                      libmaven-clean-plugin-java,
@@ -11,7 +12,7 @@ Build-Depends-Indep: ant-optional,
                      libmaven-install-plugin-java (>= 2.4),
                      libmaven-jar-plugin-java,
                      libmaven-resources-plugin-java,
-                     libmaven-shade-plugin-java,
+                     libmaven-shade-plugin-java (>= 1.7.1),
                      libmaven2-core-java (>= 2.2.1-14~),
                      maven-ant-helper,
                      maven-repo-helper
@@ -27,11 +28,11 @@ Depends: default-jre (>= 1.5) | default-jre-headless (>= 1.5) | java2-runtime |
          libmaven2-core-java,
          ${misc:Depends}
 Recommends: libmaven-clean-plugin-java,
-            libmaven-compiler-plugin-java,
-            libmaven-install-plugin-java,
+            libmaven-compiler-plugin-java (>= 2.5.1),
+            libmaven-install-plugin-java (>= 2.4),
             libmaven-jar-plugin-java,
             libmaven-resources-plugin-java,
-            libmaven-shade-plugin-java
+            libmaven-shade-plugin-java (>= 1.7.1)
 Conflicts: maven2-binary
 Replaces: maven2-binary
 Description: Java software project management and comprehension tool
diff --git a/debian/maven.rules b/debian/maven.rules
index c87926a..4dd27d2 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -3,3 +3,4 @@ org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
 * * maven-plugin *
 junit junit jar s/3\..*/3.x/
 
+org.apache.maven.plugins maven-shade-plugin * s/.*/1.7.1/
diff --git a/debian/rules b/debian/rules
index f5e83aa..b36e642 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-trax
 DEB_ANT_BUILD_TARGET := maven-compile
+DEB_ANT_CLEAN_TARGET := clean-bootstrap
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dmaven.repo.local=$(realpath $(DEB_BUILDDIR))/debian/tmp/maven-repo
 API_DOCS             := build/doc/api
@@ -36,7 +37,8 @@ binary-post-install/$(PACKAGE)::
 	chmod 0755 $(DEB_BUILDDIR)/debian/$(PACKAGE)/usr/share/maven2/bin/mvnDebug
 
 clean::
-	mh_unpatchpoms -p$(PACKAGE)
+	# The poms are already unpatched at the end of the build but the pom.xml.save files are still there, why?
+	rm -Rf  apache-maven/pom.xml.save pom.xml.save
 	-rm -rf debian/tmp/mvn-repo
 	-find . -name target -type d | xargs rm -rf
 

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