Author: nomadium-guest Date: 2012-01-14 18:13:28 +0000 (Sat, 14 Jan 2012) New Revision: 15701
Added: trunk/libspring-2.5-java/debian/patches/21_velocity_17.diff Modified: trunk/libspring-2.5-java/debian/changelog trunk/libspring-2.5-java/debian/copyright trunk/libspring-2.5-java/debian/patches/series Log: * Fix FTBFS by adding a patch that provides compatibility with Velocity 1.7. (Closes: #655808). * Fix several lintian warnings in copyright file. Modified: trunk/libspring-2.5-java/debian/changelog =================================================================== --- trunk/libspring-2.5-java/debian/changelog 2012-01-14 17:24:03 UTC (rev 15700) +++ trunk/libspring-2.5-java/debian/changelog 2012-01-14 18:13:28 UTC (rev 15701) @@ -1,3 +1,12 @@ +libspring-2.5-java (2.5.6.SEC02-8) UNRELEASED; urgency=low + + * Team upload. + * Fix FTBFS by adding a patch that provides compatibility with Velocity 1.7. + (Closes: #655808). + * Fix several lintian warnings in copyright file. + + -- Miguel Landaeta <mig...@miguel.cc> Sat, 14 Jan 2012 13:31:08 -0430 + libspring-2.5-java (2.5.6.SEC02-7) unstable; urgency=low * Build-Depends and Recommends libapache-poi-java instead of Modified: trunk/libspring-2.5-java/debian/copyright =================================================================== --- trunk/libspring-2.5-java/debian/copyright 2012-01-14 17:24:03 UTC (rev 15700) +++ trunk/libspring-2.5-java/debian/copyright 2012-01-14 18:13:28 UTC (rev 15701) @@ -1,6 +1,6 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Spring Framework -Maintainer: SpringSource +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: Spring Framework +Upstream-Contact: SpringSource Source: http://springframework.org/download Files: * @@ -16,14 +16,14 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + . http://www.apache.org/licenses/LICENSE-2.0 - + . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + . On Debian systems the full text of the Apache License can be found in the `/usr/share/common-licenses/Apache-2.0' file. Added: trunk/libspring-2.5-java/debian/patches/21_velocity_17.diff =================================================================== --- trunk/libspring-2.5-java/debian/patches/21_velocity_17.diff (rev 0) +++ trunk/libspring-2.5-java/debian/patches/21_velocity_17.diff 2012-01-14 18:13:28 UTC (rev 15701) @@ -0,0 +1,20 @@ +Description: Compatibility with Velocity 1.7 API +Author: Miguel Landaeta <mig...@miguel.cc> +Bug-Debian: http://bugs.debian.org/655808 +Forwarded: no +Last-Update: 2012-01-14 + +--- libspring-2.5-java-2.5.6.SEC02.orig/src/org/springframework/ui/velocity/VelocityEngineFactory.java ++++ libspring-2.5-java-2.5.6.SEC02/src/org/springframework/ui/velocity/VelocityEngineFactory.java +@@ -255,9 +255,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-2.5-java/debian/patches/series =================================================================== --- trunk/libspring-2.5-java/debian/patches/series 2012-01-14 17:24:03 UTC (rev 15700) +++ trunk/libspring-2.5-java/debian/patches/series 2012-01-14 18:13:28 UTC (rev 15701) @@ -17,3 +17,4 @@ 18_hibernate_36.diff 19_quartz_17.diff 20_jasperreports41.diff +21_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
