Author: nomadium-guest
Date: 2012-01-14 17:24:03 +0000 (Sat, 14 Jan 2012)
New Revision: 15700

Added:
   trunk/libspring-java/debian/patches/0010_velocity_17.diff
Modified:
   trunk/libspring-java/debian/changelog
   trunk/libspring-java/debian/patches/series
Log:
Add patch for Velocity 1.7 API changes


Modified: trunk/libspring-java/debian/changelog
===================================================================
--- trunk/libspring-java/debian/changelog       2012-01-14 10:59:14 UTC (rev 
15699)
+++ trunk/libspring-java/debian/changelog       2012-01-14 17:24:03 UTC (rev 
15700)
@@ -1,3 +1,10 @@
+libspring-java (3.0.6.RELEASE-5) unstable; urgency=low
+
+  * Fix FTBFS by adding a patch that provides compatibility with Velocity 1.7.
+    (Closes: #655812).
+
+ -- Miguel Landaeta <mig...@miguel.cc>  Sat, 14 Jan 2012 12:08:53 -0430
+
 libspring-java (3.0.6.RELEASE-4) unstable; urgency=low
 
   * Build-Depends and Recommends libapache-poi-java instead of

Added: trunk/libspring-java/debian/patches/0010_velocity_17.diff
===================================================================
--- trunk/libspring-java/debian/patches/0010_velocity_17.diff                   
        (rev 0)
+++ trunk/libspring-java/debian/patches/0010_velocity_17.diff   2012-01-14 
17:24:03 UTC (rev 15700)
@@ -0,0 +1,20 @@
+Description: Compatibility with Velocity 1.7 API
+Author: Miguel Landaeta <mig...@miguel.cc>
+Bug-Debian: http://bugs.debian.org/655812
+Forwarded: no
+Last-Update: 2012-01-14
+
+--- 
libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
++++ 
libspring-java-3.0.6.RELEASE/projects/org.springframework.context.support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
+@@ -250,9 +250,11 @@ public class VelocityEngineFactory {
+                       // Perform actual initialization.
+                       velocityEngine.init();
+               }
++              /* Since Velocity 1.7 initialization call doesn't throw 
IOExceptions
+               catch (IOException ex) {
+                       throw ex;
+               }
++              */
+               catch (VelocityException ex) {
+                       throw ex;
+               }

Modified: trunk/libspring-java/debian/patches/series
===================================================================
--- trunk/libspring-java/debian/patches/series  2012-01-14 10:59:14 UTC (rev 
15699)
+++ trunk/libspring-java/debian/patches/series  2012-01-14 17:24:03 UTC (rev 
15700)
@@ -6,3 +6,4 @@
 0006_aspectj_classpath.diff
 0008_jpa_20_api.diff
 0009_hibernate_validator_41.diff
+0010_velocity_17.diff


_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to