[pkg-java] r16140 - trunk/stylebook/debian

[Niels Thykier]

Author: nthykier
Date: 2012-06-18 14:05:20 +0000 (Mon, 18 Jun 2012)
New Revision: 16140

Modified:
   trunk/stylebook/debian/changelog
   trunk/stylebook/debian/rules
Log:
Specify source/target = 1.5 for all javac commands

Modified: trunk/stylebook/debian/changelog
===================================================================
--- trunk/stylebook/debian/changelog	2012-06-18 13:19:02 UTC (rev 16139)
+++ trunk/stylebook/debian/changelog	2012-06-18 14:05:20 UTC (rev 16140)
@@ -1,3 +1,13 @@
+stylebook (1.0~b3~svn20061109-6) UNRELEASED; urgency=low
+
+  * Team upload.
+  * d/rules: Specify source/target = 1.5 for all javac commands to 
+    ensure backwards compatibility and workaround Java 7 encoding
+    errors.   Thanks to James Page for the report and the patch.
+    (Closes: #651182, LP: #888127)
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 18 Jun 2012 16:00:13 +0200
+
 stylebook (1.0~b3~svn20061109-5) unstable; urgency=low
 
   * Fix wrong jar installation names.

Modified: trunk/stylebook/debian/rules
===================================================================
--- trunk/stylebook/debian/rules	2012-06-18 13:19:02 UTC (rev 16139)
+++ trunk/stylebook/debian/rules	2012-06-18 14:05:20 UTC (rev 16140)
@@ -14,7 +14,8 @@
 		done; \
 		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
 
-DEB_ANT_ARGS	:= -Dbin.dir=build
+DEB_ANT_ARGS	:= -Dbin.dir=build -Dant.build.javac.source=1.5 \
+	    -Dant.build.javac.target=1.5
 ANT_INVOKE	:= $(JAVACMD) -classpath $(DEB_CLASSPATH) \
 		org.apache.tools.ant.Main $(DEB_ANT_ARGS)