[pkg-java] r16157 - trunk/tiles/debian

[Niels Thykier]

Author: nthykier
Date: 2012-06-19 11:10:18 +0000 (Tue, 19 Jun 2012)
New Revision: 16157

Modified:
   trunk/tiles/debian/build.properties
   trunk/tiles/debian/changelog
Log:
Build with source and target 1.5

Modified: trunk/tiles/debian/build.properties
===================================================================
--- trunk/tiles/debian/build.properties	2012-06-19 11:01:14 UTC (rev 16156)
+++ trunk/tiles/debian/build.properties	2012-06-19 11:10:18 UTC (rev 16157)
@@ -17,3 +17,7 @@
             ${basedir}/src/tiles-core/build/tiles-core-${version}.jar:\
             ${basedir}/src/tiles-servlet/build/tiles-servlet-${version}.jar:\
             ${basedir}/src/tiles-template/build/tiles-template-${version}.jar
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5

Modified: trunk/tiles/debian/changelog
===================================================================
--- trunk/tiles/debian/changelog	2012-06-19 11:01:14 UTC (rev 16156)
+++ trunk/tiles/debian/changelog	2012-06-19 11:10:18 UTC (rev 16157)
@@ -1,3 +1,12 @@
+tiles (2.2.2-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Build with source and target 1.5 to ensure a proper build
+    with Java7.  Thanks to James Page for the report and the
+    patch.  (Closes: #678118)
+
+ -- Niels Thykier <niels at thykier.net>  Tue, 19 Jun 2012 13:08:51 +0200
+
 tiles (2.2.2-2) unstable; urgency=low
 
   [ Miguel Landaeta ]