[pkg-java] r17524 - trunk/maven2/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-12-02 14:35:17 +0000 (Mon, 02 Dec 2013)
New Revision: 17524

Modified:
   trunk/maven2/debian/changelog
   trunk/maven2/debian/control
   trunk/maven2/debian/maven.rules
   trunk/maven2/debian/rules
Log:
Updated the dependency on libmaven-shade-plugin-java to 1.7.1
debian/rules: Modified the clean target to allow rebuilds



Modified: trunk/maven2/debian/changelog
===================================================================
--- trunk/maven2/debian/changelog	2013-12-02 13:53:49 UTC (rev 17523)
+++ trunk/maven2/debian/changelog	2013-12-02 14:35:17 UTC (rev 17524)
@@ -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

Modified: trunk/maven2/debian/control
===================================================================
--- trunk/maven2/debian/control	2013-12-02 13:53:49 UTC (rev 17523)
+++ trunk/maven2/debian/control	2013-12-02 14:35:17 UTC (rev 17524)
@@ -3,7 +3,8 @@
 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 @@
                      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 @@
          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

Modified: trunk/maven2/debian/maven.rules
===================================================================
--- trunk/maven2/debian/maven.rules	2013-12-02 13:53:49 UTC (rev 17523)
+++ trunk/maven2/debian/maven.rules	2013-12-02 14:35:17 UTC (rev 17524)
@@ -3,3 +3,4 @@
 * * maven-plugin *
 junit junit jar s/3\..*/3.x/
 
+org.apache.maven.plugins maven-shade-plugin * s/.*/1.7.1/

Modified: trunk/maven2/debian/rules
===================================================================
--- trunk/maven2/debian/rules	2013-12-02 13:53:49 UTC (rev 17523)
+++ trunk/maven2/debian/rules	2013-12-02 14:35:17 UTC (rev 17524)
@@ -8,6 +8,7 @@
 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 @@
 	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