[pkg-java] r15571 - trunk/velocity/debian

[Steffen Möller]

Author: moeller
Date: 2011-12-21 21:39:20 +0000 (Wed, 21 Dec 2011)
New Revision: 15571

Modified:
   trunk/velocity/debian/changelog
   trunk/velocity/debian/control
   trunk/velocity/debian/maven.rules
   trunk/velocity/debian/rules
   trunk/velocity/debian/velocity.poms
Log:
Update of package for velocity 1.7.


Modified: trunk/velocity/debian/changelog
===================================================================
--- trunk/velocity/debian/changelog	2011-12-21 16:18:41 UTC (rev 15570)
+++ trunk/velocity/debian/changelog	2011-12-21 21:39:20 UTC (rev 15571)
@@ -1,3 +1,9 @@
+velocity (1.7-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Fri, 02 Dec 2011 20:36:38 +0000
+
 velocity (1.6.4-1) unstable; urgency=low
 
   * Team upload

Modified: trunk/velocity/debian/control
===================================================================
--- trunk/velocity/debian/control	2011-12-21 16:18:41 UTC (rev 15570)
+++ trunk/velocity/debian/control	2011-12-21 21:39:20 UTC (rev 15571)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libmaven-javadoc-plugin-java, ant, libcommons-collections3-java, libcommons-lang-java,  
+Build-Depends: debhelper (>= 7.0.50~), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven-javadoc-plugin-java, ant,
+ libcommons-collections3-java, libcommons-lang-java,  
  libcommons-logging-java, libexcalibur-logger-java, libjdom1-java (>= 1.0),  
  liblog4j1.2-java, liboro-java, libservlet2.4-java, libwerken.xpath-java,  
  junit, libhsqldb-java, ant-doc, default-jdk-doc, libcommons-logging-java-doc,  

Modified: trunk/velocity/debian/maven.rules
===================================================================
--- trunk/velocity/debian/maven.rules	2011-12-21 16:18:41 UTC (rev 15570)
+++ trunk/velocity/debian/maven.rules	2011-12-21 21:39:20 UTC (rev 15571)
@@ -23,4 +23,5 @@
 org.apache.velocity velocity jar s/.*/debian/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
+log4j log4j * s/1\.2\..*/1.2.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *

Modified: trunk/velocity/debian/rules
===================================================================
--- trunk/velocity/debian/rules	2011-12-21 16:18:41 UTC (rev 15570)
+++ trunk/velocity/debian/rules	2011-12-21 21:39:20 UTC (rev 15571)
@@ -9,4 +9,4 @@
 #DEB_MAVEN_DOC_TARGET = javadoc:jar site:site
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --debug --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Modified: trunk/velocity/debian/velocity.poms
===================================================================
--- trunk/velocity/debian/velocity.poms	2011-12-21 16:18:41 UTC (rev 15570)
+++ trunk/velocity/debian/velocity.poms	2011-12-21 21:39:20 UTC (rev 15571)
@@ -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 with mh_install or mh_installpoms. To use with POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars.
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -20,7 +22,5 @@
 #   --dest-jar=<path>: the destination for the real jar
 #   it will be installed with 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.
 #
 pom.xml --no-parent --has-package-version