Author: jamespage-guest Date: 2011-10-23 21:11:41 +0000 (Sun, 23 Oct 2011) New Revision: 15244
Added: 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: * Fix maven metadata to use libservlet2.5-java artifacts * Drop dependency on libxerces2-java; no longer required as JAX-P implementation is provided by default-jdk. Modified: trunk/httpunit/debian/changelog =================================================================== --- trunk/httpunit/debian/changelog 2011-10-23 17:50:55 UTC (rev 15243) +++ trunk/httpunit/debian/changelog 2011-10-23 21:11:41 UTC (rev 15244) @@ -1,3 +1,11 @@ +httpunit (1.7+dfsg-7) UNRELEASED; urgency=low + + * Fix maven metadata to use libservlet2.5-java artifacts + * Drop dependency on libxerces2-java; no longer required as JAX-P + implementation is provided by default-jdk. + + -- James Page <james.p...@ubuntu.com> Sun, 23 Oct 2011 20:38:26 +0100 + httpunit (1.7+dfsg-6) unstable; urgency=low * Update maven metadata about jtidy dependency. (Closes: #643749). Modified: trunk/httpunit/debian/control =================================================================== --- trunk/httpunit/debian/control 2011-10-23 17:50:55 UTC (rev 15243) +++ trunk/httpunit/debian/control 2011-10-23 21:11:41 UTC (rev 15244) @@ -5,7 +5,7 @@ Priority: optional Build-Depends: default-jdk, ant, javahelper, debhelper (>= 7.0.50~), rhino, libjtidy-java, libgnujaf-java, junit, libgnumail-java, - libservlet2.5-java, libxerces2-java, libnekohtml-java, + libservlet2.5-java, libnekohtml-java, maven-repo-helper (>= 1.6) Standards-Version: 3.9.2 Homepage: http://httpunit.org/ @@ -14,7 +14,7 @@ Package: libhttpunit-java Architecture: all -Depends: libxerces2-java, libnekohtml-java, rhino, libjtidy-java, +Depends: libnekohtml-java, rhino, libjtidy-java, libservlet2.5-java, ${misc:Depends} Recommends: junit Suggests: libhttpunit-java-doc (= ${binary:Version}) Added: trunk/httpunit/debian/maven.ignoreRules =================================================================== --- trunk/httpunit/debian/maven.ignoreRules (rev 0) +++ trunk/httpunit/debian/maven.ignoreRules 2011-10-23 21:11:41 UTC (rev 15244) @@ -0,0 +1 @@ +xerces * * * * * Modified: trunk/httpunit/debian/maven.rules =================================================================== --- trunk/httpunit/debian/maven.rules 2011-10-23 17:50:55 UTC (rev 15243) +++ trunk/httpunit/debian/maven.rules 2011-10-23 21:11:41 UTC (rev 15244) @@ -1,3 +1,4 @@ s/nekohtml/net.sourceforge.nekohtml/ nekohtml jar s/.*/debian/ * -s/xerces/javax.xml/ s/xmlParserAPIs/jaxp-api/ 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-23 17:50:55 UTC (rev 15243) +++ trunk/httpunit/debian/patches/add_classpath_to_manifest 2011-10-23 21:11:41 UTC (rev 15244) @@ -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 xercesImpl.jar"/> ++ <attribute name="Class-Path" value="jtidy.jar nekohtml.jar"/> + </manifest> <fileset dir="${build.classes}" includes="com/**"/> <fileset dir="META-INF" includes="*.dtd"/> _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
