Bug#651810: libhibernate3-java: Patch to Fix FTBFS with OpenJDK7 and avoid incremental build on Ubuntu

This is a multi-part MIME message sent by reportbug.


MIME-Version: 1.0

Package: libhibernate3-java
Version: 3.6.8.Final-1
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Hash: SHA256

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

* Merge from Debian testing. Remaining changes:
- d/maven.properties: Specify source file encoding to fix Java
encoding errors during Javadoc generation with OpenJDK7.
- d/rules: Use maven install target to avoid incremental builds
with new versions on Ubuntu.
- d/control: Build-Deps-Indep - drop self-dependency and add new
dependency to libmaven-install-plugin-java to support use of
install target.

Using the maven install target ensures that artifacts are installed
in the local maven repo during the build process; the javadoc targets
are then able to pick them up OK during doc generation avoiding the need
to complete incremental builds of this package in Ubuntu when a new
upstream version lands.

Thanks for considering the patch.


Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


MIME-Version: 1.0
filename="libhibernate3-java_3.6.8.Final-1ubuntu1.debdiff"

libhibernate3-java-3.6.8.Final/debian/control 2011-11-27 22:10:19.000000000 +0000
+++ libhibernate3-java-3.6.8.Final/debian/control 2011-12-12 09:40:11.000000000 +0000
@@ -11,7 +12,7 @@
libmaven-enforcer-plugin-java, libhsqldb-java, libcommons-logging-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,
+ libmaven-install-plugin-java, libmaven-javadoc-plugin-java,
libgeronimo-jpa-2.0-spec-java,
libgeronimo-validation-1.0-spec-java, libhibernate-commons-annotations-java,
libhibernate-validator-java, libmaven-antrun-plugin-java
diff -Nru libhibernate3-java-3.6.8.Final/debian/maven.properties libhibernate3-java-3.6.8.Final/debian/maven.properties
libhibernate3-java-3.6.8.Final/debian/maven.properties 2011-11-27 22:10:19.000000000 +0000
+++ libhibernate3-java-3.6.8.Final/debian/maven.properties 2011-12-09 20:47:19.000000000 +0000
@@ -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 -Nru libhibernate3-java-3.6.8.Final/debian/rules libhibernate3-java-3.6.8.Final/debian/rules
libhibernate3-java-3.6.8.Final/debian/rules 2011-11-27 22:41:53.000000000 +0000
+++ libhibernate3-java-3.6.8.Final/debian/rules 2011-12-12 09:35:36.000000000 +0000
@@ -5,6 +5,7 @@

JAVA_HOME := /usr/lib/jvm/default-java
DEB_MAVEN_DOC_TARGET := javadoc:aggregate
+DEB_MAVEN_BUILD_TARGET := install
DEB_BUILDDIR := $(CURDIR)/project

clean::




To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org