Bug#452875: xmlgraphics-commons: Patch to build with gcj

[Daniel Hahler]

Package: xmlgraphics-commons
Version: 1.2.dfsg-1
Followup-For: Bug #452875
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu hardy ubuntu-patch

In Ubuntu, we've applied the attached patch to achieve the following:

  * Merge from Debian unstable. Remaining Ubuntu changes:
    * Build-depend on java-gcj-compat
      - debian/control: Replace sun-java6-jdk with
        "java-gcj-compat-dev (>= 1.0.69-2) | java2-compiler" in
        Build-depend-Indep
      - debian/rules:
        use JAVA_HOME_DIRS, add /usr/lib/jvm/java-gcj/
    * DebianMaintainerField

We thought you might be interested in doing the same or something
similar.

Thank you.
-------------- next part --------------
diff -u xmlgraphics-commons-1.2.dfsg/debian/rules xmlgraphics-commons-1.2.dfsg/debian/rules
--- xmlgraphics-commons-1.2.dfsg/debian/rules
+++ xmlgraphics-commons-1.2.dfsg/debian/rules
@@ -6,8 +6,7 @@
 
 export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | sed -e 's/.dfsg.*//')
 
-#JAVA_HOME := /usr/lib/jvm/java-gcj
-JAVA_HOME := /usr/lib/jvm/java-6-sun
+JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj/ /usr/lib/jvm/java-6-sun/
 
 # no junit test at the moment
 DEB_JARS := commons-io #junit ant-junit
diff -u xmlgraphics-commons-1.2.dfsg/debian/control xmlgraphics-commons-1.2.dfsg/debian/control
--- xmlgraphics-commons-1.2.dfsg/debian/control
+++ xmlgraphics-commons-1.2.dfsg/debian/control
@@ -1,10 +1,11 @@
 Source: xmlgraphics-commons
 Section: contrib/libs
 Priority: optional
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>5), cdbs
-Build-Depends-Indep: sun-java6-jdk, ant-optional, libcommons-io-java (>= 1.3.1), junit
+Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2) | java2-compiler, ant-optional, libcommons-io-java (>= 1.3.1), junit
 Standards-Version: 3.7.3
 
 Package: libxmlgraphics-commons-java