[SCM] guava-libraries: suite of Google Common Libraries for Java 5.0 branch, master, updated. debian/09-1-1-g9f921fb

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 9f921fbb546d0997db2134fbdf64e353923ae0a7
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Thu Dec 8 19:34:34 2011 -0430

    Fix FTBFS with OpenJDK7

diff --git a/debian/changelog b/debian/changelog
index 4110f31..d37fa90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+guava-libraries (09-2) UNRELEASED; urgency=low
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888939) (Closes: #651408):
+    - d/rules: Specify source/target as 1.5 for javac and javadoc to 
+      ensure backwards compatibility and work around Java 7 encoding
+      errors. 
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 08 Dec 2011 19:20:25 -0430
+
 guava-libraries (09-1) unstable; urgency=low
 
   [ Miguel Landaeta ]
diff --git a/debian/rules b/debian/rules
index 69576f4..1012b4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export CLASSPATH := /usr/share/java/jsr305.jar
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	jh_build guava.jar src
+	jh_build --javacopts="-source 1.5 -target 1.5" --javadoc-opts="-source 1.5" guava.jar src
 
 override_dh_auto_install:
 	mh_installpoms -p$(PACKAGE)

-- 
guava-libraries: suite of Google Common Libraries for Java 5.0