[pkg-java] r17562 - trunk/maven-common-artifact-filters/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-12-04 14:10:22 +0000 (Wed, 04 Dec 2013)
New Revision: 17562

Modified:
   trunk/maven-common-artifact-filters/debian/changelog
   trunk/maven-common-artifact-filters/debian/control
   trunk/maven-common-artifact-filters/debian/copyright
   trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java.poms
   trunk/maven-common-artifact-filters/debian/maven.rules
Log:
New upstream release (1.4)



Modified: trunk/maven-common-artifact-filters/debian/changelog
===================================================================
--- trunk/maven-common-artifact-filters/debian/changelog	2013-12-04 13:50:39 UTC (rev 17561)
+++ trunk/maven-common-artifact-filters/debian/changelog	2013-12-04 14:10:22 UTC (rev 17562)
@@ -1,6 +1,8 @@
-maven-common-artifact-filters (1.2-2) UNRELEASED; urgency=low
+maven-common-artifact-filters (1.4-1) UNRELEASED; urgency=low
 
   * Team upload.
+  * New upstream release
+    - Replaced the build dependency on junit with junit4
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields

Modified: trunk/maven-common-artifact-filters/debian/control
===================================================================
--- trunk/maven-common-artifact-filters/debian/control	2013-12-04 13:50:39 UTC (rev 17561)
+++ trunk/maven-common-artifact-filters/debian/control	2013-12-04 14:10:22 UTC (rev 17562)
@@ -5,7 +5,7 @@
 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 (>= 3.8.1),
+                     junit4,
                      libeasymock-java,
                      libmaven-javadoc-plugin-java,
                      libmaven-plugin-testing-java,

Modified: trunk/maven-common-artifact-filters/debian/copyright
===================================================================
--- trunk/maven-common-artifact-filters/debian/copyright	2013-12-04 13:50:39 UTC (rev 17561)
+++ trunk/maven-common-artifact-filters/debian/copyright	2013-12-04 14:10:22 UTC (rev 17562)
@@ -4,7 +4,7 @@
 Source: http://maven.apache.org
 
 Files: *
-Copyright: 2001-2009, The Apache Software Foundation.
+Copyright: 2001-2011, The Apache Software Foundation.
 License: Apache-2.0
 
 Files: debian/*

Modified: trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java.poms
===================================================================
--- trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java.poms	2013-12-04 13:50:39 UTC (rev 17561)
+++ trunk/maven-common-artifact-filters/debian/libmaven-common-artifact-filters-java.poms	2013-12-04 14:10:22 UTC (rev 17562)
@@ -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
+pom.xml --no-parent --has-package-version --java-lib

Modified: trunk/maven-common-artifact-filters/debian/maven.rules
===================================================================
--- trunk/maven-common-artifact-filters/debian/maven.rules	2013-12-04 13:50:39 UTC (rev 17561)
+++ trunk/maven-common-artifact-filters/debian/maven.rules	2013-12-04 14:10:22 UTC (rev 17562)
@@ -16,7 +16,7 @@
 # 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/ * *
+junit junit jar s/4\..*/4.x/ * *
 org.apache.maven.shared maven-common-artifact-filters jar s/.*/debian/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *