[pkg-java] r9117 - trunk/nekohtml/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-12 20:20:57 +0000 (Sun, 12 Jul 2009)
New Revision: 9117

Modified:
   trunk/nekohtml/debian/changelog
   trunk/nekohtml/debian/control
   trunk/nekohtml/debian/rules
Log:
* Fix FTBFS when using gcj

Modified: trunk/nekohtml/debian/changelog
===================================================================
--- trunk/nekohtml/debian/changelog	2009-07-12 20:19:19 UTC (rev 9116)
+++ trunk/nekohtml/debian/changelog	2009-07-12 20:20:57 UTC (rev 9117)
@@ -13,6 +13,9 @@
   * 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
 

Modified: trunk/nekohtml/debian/control
===================================================================
--- trunk/nekohtml/debian/control	2009-07-12 20:19:19 UTC (rev 9116)
+++ trunk/nekohtml/debian/control	2009-07-12 20:20:57 UTC (rev 9117)
@@ -4,7 +4,7 @@
 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 @@
 
 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

Modified: trunk/nekohtml/debian/rules
===================================================================
--- trunk/nekohtml/debian/rules	2009-07-12 20:19:19 UTC (rev 9116)
+++ trunk/nekohtml/debian/rules	2009-07-12 20:20:57 UTC (rev 9117)
@@ -7,7 +7,7 @@
 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)