[pkg-java] r17523 - in trunk/maven-shade-plugin/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-12-02 13:53:49 +0000 (Mon, 02 Dec 2013)
New Revision: 17523

Modified:
   trunk/maven-shade-plugin/debian/changelog
   trunk/maven-shade-plugin/debian/control
   trunk/maven-shade-plugin/debian/maven.rules
   trunk/maven-shade-plugin/debian/orig-tar.sh
   trunk/maven-shade-plugin/debian/patches/descriptor.patch
Log:
New upstream release (1.7.1)
Refreshed the patch
New runtime dependency on libjdependency-java
New build dependency on libxmlunit-java
Build depend on junit4 instead of junit
debian/orig-tar.sh: Do not remove the jars used as test elements



Modified: trunk/maven-shade-plugin/debian/changelog
===================================================================
--- trunk/maven-shade-plugin/debian/changelog	2013-12-02 11:40:51 UTC (rev 17522)
+++ trunk/maven-shade-plugin/debian/changelog	2013-12-02 13:53:49 UTC (rev 17523)
@@ -1,13 +1,19 @@
-maven-shade-plugin (1.2.1-5) UNRELEASED; urgency=low
+maven-shade-plugin (1.7.1-1) unstable; urgency=low
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patch
+    - New runtime dependency on libjdependency-java
+    - New build dependency on libxmlunit-java
+    - Build depend on junit4 instead of junit
   * debian/control:
     - Updated Standards-Version to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields
   * Switch to debhelper level 9
   * debian/copyright: Update to the Copyright Format 1.0
+  * debian/orig-tar.sh: Do not remove the jars used as test elements
 
- -- Emmanuel Bourg <ebourg at apache.org>  Tue, 05 Nov 2013 10:40:16 +0100
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 02 Dec 2013 14:52:31 +0100
 
 maven-shade-plugin (1.2.1-4) unstable; urgency=low
 

Modified: trunk/maven-shade-plugin/debian/control
===================================================================
--- trunk/maven-shade-plugin/debian/control	2013-12-02 11:40:51 UTC (rev 17522)
+++ trunk/maven-shade-plugin/debian/control	2013-12-02 13:53:49 UTC (rev 17523)
@@ -5,8 +5,9 @@
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: default-jdk-doc,
-                     junit,
+                     junit4,
                      libasm3-java,
+                     libjdependency-java,
                      libjdom1-java (>= 1.0),
                      libjdom1-java-doc,
                      libmaven-dependency-tree-java,
@@ -18,7 +19,8 @@
                      libplexus-container-default-java-doc,
                      libplexus-maven-plugin-java,
                      libplexus-utils-java,
-                     libplexus-utils-java-doc
+                     libplexus-utils-java-doc,
+                     libxmlunit-java
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-shade-plugin
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-shade-plugin/

Modified: trunk/maven-shade-plugin/debian/maven.rules
===================================================================
--- trunk/maven-shade-plugin/debian/maven.rules	2013-12-02 11:40:51 UTC (rev 17522)
+++ trunk/maven-shade-plugin/debian/maven.rules	2013-12-02 13:53:49 UTC (rev 17523)
@@ -17,6 +17,6 @@
 #   junit junit jar s/3\\..*/3.x/
 
 s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * *
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 asm * * s/3\..*/3.x/ * *

Modified: trunk/maven-shade-plugin/debian/orig-tar.sh
===================================================================
--- trunk/maven-shade-plugin/debian/orig-tar.sh	2013-12-02 11:40:51 UTC (rev 17522)
+++ trunk/maven-shade-plugin/debian/orig-tar.sh	2013-12-02 13:53:49 UTC (rev 17523)
@@ -6,7 +6,7 @@
 TAG=$(echo "maven-shade-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
 
 svn export http://svn.apache.org/repos/asf/maven/plugins/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.class' $DIR
 rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'

Modified: trunk/maven-shade-plugin/debian/patches/descriptor.patch
===================================================================
--- trunk/maven-shade-plugin/debian/patches/descriptor.patch	2013-12-02 11:40:51 UTC (rev 17522)
+++ trunk/maven-shade-plugin/debian/patches/descriptor.patch	2013-12-02 13:53:49 UTC (rev 17523)
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
-@@ -101,7 +101,7 @@
+@@ -112,7 +112,7 @@
      /**
       * The dependency tree builder to use.
       *