[nekohtml] 22/46: * Fix FTBFS when using gcj

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository nekohtml.

commit 2bf0dd942b1f06fa0a440bbf823779a13ec4db4a
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Sun Jul 12 20:20:57 2009 +0000

    * Fix FTBFS when using gcj
---
 debian/changelog | 3 +++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce51d32..150f757 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ nekohtml (1.9.12-1) unstable; urgency=low
   * Add a Build-Depends-Indep dependency on maven-repo-helper
   * Use mh_installpom and mh_installjar to install the POM and the jar to the
     Maven repository
+  * Change Build-Depends from libxalan-java to libjaxp3-java and 
+    add libjaxp3-java as it contains the xml-apis.jar needed for the build
+    and runtime on Java < 6.
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 29 Apr 2009 19:33:43 +0100
 
diff --git a/debian/control b/debian/control
index 85906d8..c35ccb4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marcus Better <marcus at better.se>
 Build-Depends: debhelper (>= 6.0.0), cdbs, default-jdk-builddep, quilt
-Build-Depends-Indep: maven-repo-helper, ant, libxerces2-java (>= 2.9.1), libxalan2-java
+Build-Depends-Indep: maven-repo-helper, ant, libxerces2-java (>= 2.9.1), libjaxp1.3-java (>= 1.3.04-4)
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/nekohtml
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/nekohtml/
@@ -12,7 +12,7 @@ Homepage: http://nekohtml.sourceforge.net/
 
 Package: libnekohtml-java
 Architecture: all
-Depends: ${misc:Depends}, libxerces2-java (>= 2.9.1)
+Depends: ${misc:Depends}, libxerces2-java (>= 2.9.1), libjaxp1.3-java (>= 1.3.04-4)
 Suggests: libnekohtml-java-doc
 Description: HTML parser for Java
  This is a simple HTML scanner and tag balancer that enables
diff --git a/debian/rules b/debian/rules
index 558d731..3055379 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := xml-apis xalan2 xercesImpl
+DEB_JARS             := xml-apis xercesImpl
 DEB_ANT_BUILD_TARGET := jar jar-xni doc
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_ARGS         := -Dname=$(PACKAGE) -Dversion=$(VERSION)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nekohtml.git