Package: bcel
Version: 5.2-7
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS with Java 7 (LP: #888120):
- d/patches/encoding.patch: Fix encoding for javac and javadoc calls
to ensure compatibility with Java 7.
- d/ant.properties: Set Java source and target to 1.5 for backwards
compatibility.
This patch ensures compatibility with Java 7 which considers encoding
problems to be errors rather than warnings.
Thanks for considering the patch.
- -- System Information:
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-2-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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJO3cxQAAoJEL/srsug59jDIQcP/jArQ18pOzr2ban8kVAVS3Zz
tNZeF2zRsQCR40qz9F/15JBCmA9pPk3OxMQRszMxfBc9jsCRpW72yCOPq5UHD1sO
GODZgkCHaTNDf33iuRwmqNFzBsFKSjmjeEssLrQiXQcErNX9Kj4Ln6ipYF10iYMZ
o5+h13Z4ALpBbApNpJD/uI7dy9HVTd9vm8pdIGvTCOpPTfkUpRpUgNj36o/jnPjQ
NxG/MoPqxlQ5Nt4FoPaliXX9NjGop/1lODQqZ7ribJoDi+NzqG/fxZkAVlsEbc//
lo33G4g2kGLhL0lndBYT4Bthzjj66etxwdyLqhOU2vB0aJD0Jn+ix7PsyoWfgz2d
ZWh+9EC5pu0iCE3G9BCgNHUwSW2omxwVgJ+nhdKbLOgjaRb9pdEUTK7TYyTTkQ7X
DtT9y0+1c2emhNl8nosvoF7rw0XKRkV4/WNpgpJKdDIxb1Gtx24xEUm74+s9joxS
WC/Yj+6BfqWm7CuPUMatZWwAggRgBPcbpbSw3FXAbqi2mXcSX/Z5atkx8oJvl3ld
w9wk+QVOsAuwyRIDYnPvPXFSoaUy6/82JnPhqwS/kpjz/pxha+oJnMFEkQ9dbLYw
bh2+iBT5HbR3v/przA9SIJzG+uA5qWWasw3PhLu+WCrBymJKLH1pzkOcSageOhsE
qA/UC/7zgEXMVNigCldW
=8C0N
-----END PGP SIGNATURE-----
=== added file 'debian/ant.properties'
--- debian/ant.properties 1970-01-01 00:00:00 +0000
+++ debian/ant.properties 2011-12-05 17:50:36 +0000
@@ -0,0 +1,4 @@
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
=== modified file 'debian/changelog'
=== added file 'debian/patches/encoding.patch'
--- debian/patches/encoding.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/encoding.patch 2011-12-05 17:47:17 +0000
@@ -0,0 +1,33 @@
+Description: Fix encoding of source files for Java 7 compatibility
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
+Index: bcel/build.xml
+===================================================================
+--- bcel.orig/build.xml 2011-12-05 14:50:45.203906796 +0000
++++ bcel/build.xml 2011-12-05 14:51:00.535956116 +0000
+@@ -39,7 +39,7 @@
+ <target name="compile" description="o Compile the code" depends="get-deps">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" encoding="ISO-8859-1">
+ <src>
+ <pathelement location="src/java">
+ </pathelement>
+@@ -100,7 +100,7 @@
+ </property>
+ <property name="title" value="jakarta-bcel 5.2 API">
+ </property>
+- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*">
++ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*" encoding="ISO-8859-1">
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+@@ -116,4 +116,4 @@
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+-</project>
+\ No newline at end of file
++</project>
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
