[xml/sgml-pkgs] Bug#626373: jing-trang: Proposed patch to resolve FTBFS

[James Page]

Package: jing-trang
Version: 20091111-3
Followup-For: Bug #626373
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch



*** /tmp/tmpo_Cw1q
In Ubuntu, the attached patch was applied to achieve the following:

  * Fix FTBFS (LP: #749219):
    - d/rules: use xml-resolver.jar instead of xml-commons-resolver-1.1.jar.
    - d/control: openoffice.org-java-common -> libreoffice-java-common.
    - d/rules: Pickup new location of saxon9.jar provided by 
      libreoffice-java-common.

Thanks for considering the patch.


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

Kernel: Linux 3.0.0-11-generic (SMP w/8 CPU cores)
Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2010-08-24 21:23:21 +0000
+++ debian/control	2011-09-15 11:33:08 +0000
@@ -1,9 +1,10 @@
 Source: jing-trang
 Priority: extra
-Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Samuel Thibault <sthibault at debian.org>
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: default-jdk, ant, ant-optional, testng, javacc, libsaxon-java, libxerces2-java, libxalan2-java, libisorelax-java, openoffice.org-java-common, libxml-commons-resolver1.1-java, unicode-data
+Build-Depends-Indep: default-jdk, ant, ant-optional, testng, javacc, libsaxon-java, libxerces2-java, libxalan2-java, libisorelax-java, libreoffice-java-common, libxml-commons-resolver1.1-java, unicode-data
 Standards-Version: 3.9.1
 Section: java
 Homepage: http://code.google.com/p/jing-trang/

=== modified file 'debian/rules'
--- debian/rules	2009-09-01 15:53:03 +0000
+++ debian/rules	2011-09-15 11:32:25 +0000
@@ -5,7 +5,7 @@
 JAR=jar
 
 JAVACLASSES=/usr/share/java
-CLASSPATH=$(JAVACLASSES)/isorelax.jar:$(JAVACLASSES)/xml-apis-ext.jar:$(JAVACLASSES)/xercesImpl.jar:$(JAVACLASSES)/saxon.jar:$(JAVACLASSES)/openoffice/saxon9.jar:$(JAVACLASSES)/xalan2.jar:$(JAVACLASSES)/testng.jar:$(JAVACLASSES)/xml-commons-resolver-1.1.jar
+CLASSPATH=$(JAVACLASSES)/isorelax.jar:$(JAVACLASSES)/xml-apis-ext.jar:$(JAVACLASSES)/xercesImpl.jar:$(JAVACLASSES)/saxon.jar:$(JAVACLASSES)/xalan2.jar:$(JAVACLASSES)/testng.jar:$(JAVACLASSES)/xml-resolver.jar:/usr/share/libreoffice/basis3.4/program/classes/saxon9.jar
 
 VERSION=20090818