[pkg-java] r17677 - trunk/libstruts1.2-java/debian

[Tony Mancill]

Author: tmancill
Date: 2014-01-19 05:12:22 +0000 (Sun, 19 Jan 2014)
New Revision: 17677

Modified:
   trunk/libstruts1.2-java/debian/ant.properties
   trunk/libstruts1.2-java/debian/changelog
   trunk/libstruts1.2-java/debian/control
Log:
updates for FTBFS 733397

Modified: trunk/libstruts1.2-java/debian/ant.properties
===================================================================
--- trunk/libstruts1.2-java/debian/ant.properties	2014-01-19 03:58:12 UTC (rev 17676)
+++ trunk/libstruts1.2-java/debian/ant.properties	2014-01-19 05:12:22 UTC (rev 17677)
@@ -7,7 +7,7 @@
 commons-validator.jar=/usr/share/java/commons-validator.jar
 jakarta-oro.jar=/usr/share/java/oro.jar
 jdbc20ext.jar=/usr/share/java/jdbc2_0-stdext.jar
-jsp.jar=/usr/share/java/jsp-api-2.1.jar
+jsp.jar=/usr/share/java/jsp-api-2.2.jar
 servlet.jar=/usr/share/java/servlet-api-3.0.jar
 antlr.jar=/usr/share/java/antlr.jar
 struts.el.home=contrib/struts-el

Modified: trunk/libstruts1.2-java/debian/changelog
===================================================================
--- trunk/libstruts1.2-java/debian/changelog	2014-01-19 03:58:12 UTC (rev 17676)
+++ trunk/libstruts1.2-java/debian/changelog	2014-01-19 05:12:22 UTC (rev 17677)
@@ -1,3 +1,14 @@
+libstruts1.2-java (1.2.9-7) unstable; urgency=medium
+
+  * Team upload.
+  * Address FTBFS.
+    - Add libcommons-ollections4-java to build-deps.
+    - Update jsp-api version in ant.properties from 2.1 to 2.2.
+    - Thanks to Roddy Shuler. (Closes: #733397)
+  * Bump Standards-Version to 3.9.5.
+
+ -- tony mancill <tmancill at debian.org>  Sat, 18 Jan 2014 21:06:26 -0800
+
 libstruts1.2-java (1.2.9-6) unstable; urgency=low
 
   * Transition to the Servlet API 3.0 (Closes: #713195)

Modified: trunk/libstruts1.2-java/debian/control
===================================================================
--- trunk/libstruts1.2-java/debian/control	2014-01-19 03:58:12 UTC (rev 17676)
+++ trunk/libstruts1.2-java/debian/control	2014-01-19 05:12:22 UTC (rev 17677)
@@ -10,6 +10,7 @@
                debhelper (>= 7),
                default-jdk,
                libcommons-beanutils-java (>= 1.7.0),
+               libcommons-collections-java,
                libcommons-digester-java (>= 1.7),
                libcommons-fileupload-java (>= 1.0),
                libcommons-logging-java,
@@ -18,7 +19,7 @@
                libservlet3.0-java,
                libxalan2-java,
                libxerces2-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://struts.apache.org
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libstruts1.2-java
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libstruts1.2-java/