The following commit has been merged in the master branch:
commit 0241c930cb4ab7628ee1dfca476ad920d047ee9a
Author: Miguel Landaeta <[email protected]>
Date: Tue Dec 20 19:09:17 2011 -0430
Fix FTBFS with OpenJDK7
diff --git a/debian/changelog b/debian/changelog
index 304ec63..44e0147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
libhibernate-jbosscache-java (3.3.2.GA-2) UNRELEASED; urgency=low
+ [ Miguel Landaeta ]
* Bump Standards-Version to 3.9.2. No changes were required.
- -- Miguel Landaeta <[email protected]> Sat, 24 Sep 2011 17:03:21 -0430
+ [ James Page ]
+ * Fix FTBFS with OpenJDK7 (LP: #888961) (Closes: #652042):
+ - d/rules: Specify source/target as 1.5 when calling jh_build to
+ work around Java 7 encoding errors.
+
+
+ -- Miguel Landaeta <[email protected]> Tue, 20 Dec 2011 19:10:24 -0430
libhibernate-jbosscache-java (3.3.2.GA-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 82fcab3..f6a439b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,11 @@ export JAVA_HOME=/usr/lib/jvm/default-java
export CLASSPATH=$(shell for jar in `cat debian/classpath`; do echo -n
"$${jar}:"; done)
%:
- dh --with javahelper $@
+ dh $@ --with javahelper
override_jh_build:
- jh_build hibernate-jbosscache.jar src/main
+ jh_build --javacopts="-source 1.5 -target 1.5" --javadoc-opts="-source
1.5" \
+ hibernate-jbosscache.jar src/main
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
--
hibernate-jbosscache: Integration of Hibernate with JBossCache
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
