[pkg-java] r15543 - trunk/colorpicker/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-14 03:04:18 +0000 (Wed, 14 Dec 2011)
New Revision: 15543

Modified:
   trunk/colorpicker/debian/changelog
   trunk/colorpicker/debian/control
   trunk/colorpicker/debian/rules
Log:
Fix FTBFS with OpenJDK7

Modified: trunk/colorpicker/debian/changelog
===================================================================
--- trunk/colorpicker/debian/changelog	2011-12-14 02:33:12 UTC (rev 15542)
+++ trunk/colorpicker/debian/changelog	2011-12-14 03:04:18 UTC (rev 15543)
@@ -1,3 +1,17 @@
+colorpicker (1.0.0-2) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+  * Bump Standards-Version to 3.9.2. No changes were required.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK 7 (LP: #888928) (Closes: #651398):
+    - d/rules: Override jh_build and specify source/target of 1.5 for 
+      javac and javadoc commands to ensure backwards compatibility and 
+      work around Java 7 encoding errors.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 13 Dec 2011 22:14:24 -0430
+
 colorpicker (1.0.0-1) unstable; urgency=low
 
   * Initial release of ColorPicker package. Source package is repackaged 

Modified: trunk/colorpicker/debian/control
===================================================================
--- trunk/colorpicker/debian/control	2011-12-14 02:33:12 UTC (rev 15542)
+++ trunk/colorpicker/debian/control	2011-12-14 03:04:18 UTC (rev 15543)
@@ -5,7 +5,7 @@
 Uploaders: Andrew Ross <ubuntu at rossfamily.co.uk>
 Build-Depends: debhelper (>= 7), javahelper (>=0.25) 
 Build-Depends-Indep: default-jdk, default-jdk-doc
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/colorpicker
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/colorpicker/
 Homepage: https://javagraphics.dev.java.net/

Modified: trunk/colorpicker/debian/rules
===================================================================
--- trunk/colorpicker/debian/rules	2011-12-14 02:33:12 UTC (rev 15542)
+++ trunk/colorpicker/debian/rules	2011-12-14 03:04:18 UTC (rev 15543)
@@ -13,3 +13,6 @@
 
 %:
 	dh $@ --with javahelper
+
+override_jh_build::
+	jh_build --javacopts="-source 1.5 -target 1.5" --javadoc-opts="-source 1.5"