[pkg-java] r15281 - in trunk/httpunit/debian: . patches

[James Page]

Author: jamespage-guest
Date: 2011-10-28 09:21:44 +0000 (Fri, 28 Oct 2011)
New Revision: 15281

Removed:
   trunk/httpunit/debian/maven.ignoreRules
Modified:
   trunk/httpunit/debian/changelog
   trunk/httpunit/debian/control
   trunk/httpunit/debian/maven.rules
   trunk/httpunit/debian/patches/add_classpath_to_manifest
Log:
* Fixup XML parsing with correct JAX-P 1.4 API's:
  - d/control: Restore libxerces2-java dependency.
  - d/maven.rules: Map xmlParserAPIs->xml-apis-1.4.
  - d/mavenIgnore.rules: Drop - no longer required.
  - d/patches/add_classpath_to_manifest: Restore xercesImpl.jar to 
    Class-Path.

Modified: trunk/httpunit/debian/changelog
===================================================================
--- trunk/httpunit/debian/changelog	2011-10-28 06:11:17 UTC (rev 15280)
+++ trunk/httpunit/debian/changelog	2011-10-28 09:21:44 UTC (rev 15281)
@@ -1,3 +1,14 @@
+httpunit (1.7+dfsg-8) unstable; urgency=low
+
+  * Fixup XML parsing with correct JAX-P 1.4 API's:
+    - d/control: Restore libxerces2-java dependency.
+    - d/maven.rules: Map xmlParserAPIs->xml-apis-1.4.
+    - d/mavenIgnore.rules: Drop - no longer required.
+    - d/patches/add_classpath_to_manifest: Restore xercesImpl.jar to 
+      Class-Path.
+
+ -- James Page <james.page at ubuntu.com>  Thu, 27 Oct 2011 17:13:23 +0100
+
 httpunit (1.7+dfsg-7) unstable; urgency=low
 
   * Fix maven metadata to use libservlet2.5-java artifacts

Modified: trunk/httpunit/debian/control
===================================================================
--- trunk/httpunit/debian/control	2011-10-28 06:11:17 UTC (rev 15280)
+++ trunk/httpunit/debian/control	2011-10-28 09:21:44 UTC (rev 15281)
@@ -6,7 +6,7 @@
 Priority: optional
 Build-Depends: default-jdk, ant, javahelper, debhelper (>= 7.0.50~),
  rhino, libjtidy-java, libgnujaf-java, junit, libgnumail-java,
- libservlet2.5-java, libnekohtml-java,
+ libservlet2.5-java, libnekohtml-java, libxerces2-java,
  maven-repo-helper (>= 1.6)
 Standards-Version: 3.9.2
 Homepage: http://httpunit.org/
@@ -15,8 +15,8 @@
 
 Package: libhttpunit-java
 Architecture: all
-Depends: libnekohtml-java, rhino, libjtidy-java,
- libservlet2.5-java, ${misc:Depends}
+Depends: libnekohtml-java, rhino, libjtidy-java, 
+ libservlet2.5-java, libxerces2-java, ${misc:Depends}
 Recommends: junit
 Suggests: libhttpunit-java-doc (= ${binary:Version})
 Description: automated web site testing toolkit

Deleted: trunk/httpunit/debian/maven.ignoreRules
===================================================================
--- trunk/httpunit/debian/maven.ignoreRules	2011-10-28 06:11:17 UTC (rev 15280)
+++ trunk/httpunit/debian/maven.ignoreRules	2011-10-28 09:21:44 UTC (rev 15281)
@@ -1 +0,0 @@
-xerces * * * * *

Modified: trunk/httpunit/debian/maven.rules
===================================================================
--- trunk/httpunit/debian/maven.rules	2011-10-28 06:11:17 UTC (rev 15280)
+++ trunk/httpunit/debian/maven.rules	2011-10-28 09:21:44 UTC (rev 15281)
@@ -1,4 +1,5 @@
 s/nekohtml/net.sourceforge.nekohtml/ nekohtml jar s/.*/debian/ *
+s/xerces/xml-apis/ s/xmlParserAPIs/xml-apis-1.4/ jar s/.*/debian/ *
 s/jtidy/net.sf.jtidy/ * * s/.*/debian/ *
 s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * *
 javax.servlet servlet-api jar s/2\..*/2.5/ * *

Modified: trunk/httpunit/debian/patches/add_classpath_to_manifest
===================================================================
--- trunk/httpunit/debian/patches/add_classpath_to_manifest	2011-10-28 06:11:17 UTC (rev 15280)
+++ trunk/httpunit/debian/patches/add_classpath_to_manifest	2011-10-28 09:21:44 UTC (rev 15281)
@@ -14,7 +14,7 @@
  </echo>
      <jar jarfile="${lib.dir}/${name}.jar" manifest="${build.dir}/info.txt">
 +        <manifest>
-+            <attribute name="Class-Path" value="jtidy.jar nekohtml.jar"/>
++            <attribute name="Class-Path" value="jtidy.jar nekohtml.jar xercesImpl.jar"/>
 +        </manifest>
          <fileset dir="${build.classes}" includes="com/**"/>
          <fileset dir="META-INF" includes="*.dtd"/>