The following commit has been merged in the master branch:
commit cb0c565d14b6d2d6f9592700a0fbd03551da7234
Author: Miguel Landaeta <mig...@miguel.cc>
Date:   Wed Dec 14 19:54:02 2011 -0430

    Fix FTBFS with OpenJDK 7

diff --git a/debian/changelog b/debian/changelog
index e8e9473..f4f4d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libhibernate3-java (3.6.8.Final-2) UNRELEASED; urgency=low
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK 7 (Closes: #651810):
+    - d/maven.properties: Specify source file encoding to fix Java
+      encoding errors during Javadoc generation with OpenJDK7.
+  * Add Build-Depends on libmaven-install-plugin-java to avoid incremental
+    builds with new versions.
+
+ -- Miguel Landaeta <mig...@miguel.cc>  Wed, 14 Dec 2011 19:45:13 -0430
+
 libhibernate3-java (3.6.8.Final-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 640e5fc..da76ae1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends-Indep: glassfish-javaee, libc3p0-java, 
libehcache-java,
  libantlr-maven-plugin-java, libgeronimo-jacc-1.1-spec-java, libdom4j-java,
  libjavassist-java, libantlr-java, ant, libcglib-java, libjgroups-java,
  libhibernate3-java, libmaven-javadoc-plugin-java,
- libgeronimo-jpa-2.0-spec-java,
+ libgeronimo-jpa-2.0-spec-java, libmaven-install-plugin-java,
  libgeronimo-validation-1.0-spec-java, libhibernate-commons-annotations-java,
  libhibernate-validator-java, libmaven-antrun-plugin-java
 Standards-Version: 3.9.2
diff --git a/debian/maven.properties b/debian/maven.properties
index 66129d3..1b1893e 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,3 +1,5 @@
 maven.test.failure.ignore=true
 #disableJDK6Modules=true
 disableDistribution=true
+# Set encoding for compatibilty with Java 7
+project.build.sourceEncoding=ISO-8859-1
diff --git a/debian/rules b/debian/rules
index a2b0a97..48e4a67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,12 @@ JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_MAVEN_DOC_TARGET := javadoc:aggregate
 DEB_BUILDDIR         := $(CURDIR)/project
 
+# Avoid incremental builds when packaging a new upstream release by
+# using the maven install target to ensure that artifacts are installed 
+ifeq ($(shell echo -n $(DEB_VERSION) | sed -sre 's/^.*-(.*)$$/\1/'),1)
+DEB_MAVEN_BUILD_TARGET := install
+endif
+
 clean::
        -rm -rf debian/null mvn-build
 

-- 
packaging libhibernate3-java

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to