Package: libsaxon-java
Version: 1:6.5.5-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 OpenJDK 7 (LP: #888126):
    - d/rules: Specify source/target = 1.5 for javac command
      to ensure backwards compatibility of generated bytecode 
      and work around source file encoding errors with Java 7.
    - d/rules: Specify source file encoding for javadoc command.

This ensures compatibility with openjdk-7 as and when the default
Java is switched in Debian.

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)

iQIcBAEBCAAGBQJO3jH4AAoJEL/srsug59jDITIQAK46ce39180juOTM+Ct7jSJz
WZu2YZR+2kv2Jfg71IYCdDxGcgtCjmJKwWlQRAhrOMZSelc44tX7dDlq9j/Gy5pN
xO+5Ps40A0UljBPGAcWzv5sQEo+9qYMADzDXtBeQJtkEdQHTjKWR8YJCflsI09zV
B0KAtTfWoLS16QmtRcNxCW6TpxjVC97453PZ5YaagALyaGJT3q1Raq7hxH4EFlHu
lIqn0lWHJEGIDlHcKGZL/3+kmP0OXMP22dT1AvRBo+c+ipSbC7zMMGeADmjf3HWr
P5ubEW3os8wMBvOsDMsWpfbllVLNdiQixq5iCbRHZ8YoW4TdQ5bWMACmRbRp32P+
UslfQ2BcbX3tw1tqfbynye4lrWXfg9S0KyE1URTRrsWc7Qt+494DX/Z9PB6zBbo8
vcBfYfxi5WvywGKs5+JQMOuS3HK9E4+L3wMBzk6UyrQ8Uj/xA9hWyeljHtPbHadD
kHf05wbV0WaSwVn0IFM+ujiB6CDNf5SDpRv0aGlKIZMaoHAxoO11+QNe9IiknMjO
HywScn0CAQV9xwhFilJ2AU4XEzKj0J4OvAOtZ+JAeSnyT7W/ocbymgdtzW+RBsQN
XWFG4ThwdOIJ9yWnKTqTg6iCyr/xn+AqYpccREryZRGKXMbnHwSpSZ9CbGH5Eggn
mRqIf2UTXEi1FgBJNWMg
=WuUd
-----END PGP SIGNATURE-----
=== modified file 'debian/rules'
--- debian/rules	2011-03-12 09:07:41 +0000
+++ debian/rules	2011-12-06 14:14:52 +0000
@@ -12,7 +12,7 @@
 APIDOC=build/api
 JDOM=com/icl/saxon/jdom
 CLASSPATH = /usr/share/java/jdom1.jar
-JAVADOC = $(JAVA_HOME)/bin/javadoc
+JAVADOC = $(JAVA_HOME)/bin/javadoc -encoding ISO-8859-1
 
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
@@ -24,7 +24,7 @@
 
 override_dh_auto_build:
 	if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi	
-	$(JAVA_HOME)/bin/javac -nowarn -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
+	$(JAVA_HOME)/bin/javac -nowarn -source 1.5 -target 1.5 -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
 	cp -r $(SOURCES)/META-INF $(BUILD)
 	cp debian/MANIFEST.MF $(BUILD)/META-INF
 	# split off jdom classes, everything else into saxon.jar

__
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.

Reply via email to