[tiles] 13/35: Build with source and target 1.5

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tiles.

commit b12502ecd0062e6a0616194130d515c48dbbf7da
Author: Niels Thykier <nthykier at debian.org>
Date:   Tue Jun 19 11:10:18 2012 +0000

    Build with source and target 1.5
---
 debian/build.properties | 4 ++++
 debian/changelog        | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/build.properties b/debian/build.properties
index 6e807fc..2df0016 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -17,3 +17,7 @@ classpath.compile = \
             ${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
diff --git a/debian/changelog b/debian/changelog
index c7d9028..85d4d2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tiles.git