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

[Tony Mancill]

Author: tmancill
Date: 2012-03-13 16:04:23 +0000 (Tue, 13 Mar 2012)
New Revision: 15860

Modified:
   trunk/velocity/debian/changelog
   trunk/velocity/debian/maven.rules
Log:
update d/maven.rules for libservlet2.5 transition

Modified: trunk/velocity/debian/changelog
===================================================================
--- trunk/velocity/debian/changelog	2012-03-13 09:24:38 UTC (rev 15859)
+++ trunk/velocity/debian/changelog	2012-03-13 16:04:23 UTC (rev 15860)
@@ -1,3 +1,11 @@
+velocity (1.7-3) unstable; urgency=low
+
+  * Team upload.
+  * Update d/maven.rules for rebuild against libservlet2.5-java.
+    - Thanks to Brian Thomason and Miguel Landaeta. (Closes: #662810)
+
+ -- tony mancill <tmancill at debian.org>  Mon, 12 Mar 2012 20:51:51 -0700
+
 velocity (1.7-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/velocity/debian/maven.rules
===================================================================
--- trunk/velocity/debian/maven.rules	2012-03-13 09:24:38 UTC (rev 15859)
+++ trunk/velocity/debian/maven.rules	2012-03-13 16:04:23 UTC (rev 15860)
@@ -25,3 +25,4 @@
 s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
+javax.servlet servlet-api * s/.*/2.5/ * *