Author: ebourg-guest Date: 2013-07-25 13:41:01 +0000 (Thu, 25 Jul 2013) New Revision: 17062
Added: trunk/xom/debian/patches/0006-Compile-with-ant-runtime.patch trunk/xom/debian/patches/0007-Remove-jarjar.patch Modified: trunk/xom/debian/changelog trunk/xom/debian/control trunk/xom/debian/patches/0001-Remove-jaxen-from-build.patch trunk/xom/debian/patches/0002-Remove-a-directory-during-cleaning.patch trunk/xom/debian/patches/0003-Add-compile15-to-compile-core-depends.patch trunk/xom/debian/patches/0004-Remove-sun-imports.patch trunk/xom/debian/patches/0005-Remove-external-links.patch trunk/xom/debian/patches/series Log: New upstream release (1.2.10) Refreshed the patches Added a patch to include the Ant runtime when compiling Added a patch to replace jarjar with the regular jar Ant task Removed 0004-Remove-sun-imports.patch since the JDK15XML1_0Parser is really meant to be used with the parser provided by the JDK and not the standalone version of Xerces. debian/control: - Added the missing runtime dependency on libxerces2-java (Closes: #628142) - Updated Standards-Version to 3.9.4 (no changes) - Use canonical URLs for the Vcs-* fields - Removed the article at the beginning of the short description Modified: trunk/xom/debian/changelog =================================================================== --- trunk/xom/debian/changelog 2013-07-25 09:37:12 UTC (rev 17061) +++ trunk/xom/debian/changelog 2013-07-25 13:41:01 UTC (rev 17062) @@ -1,3 +1,20 @@ +xom (1.2.10-1) unstable; urgency=low + + * New upstream release + * Refreshed the patches + * Added a patch to include the Ant runtime when compiling + * Added a patch to replace jarjar with the regular jar Ant task + * Removed 0004-Remove-sun-imports.patch since the JDK15XML1_0Parser is really + meant to be used with the parser provided by the JDK and not the standalone + version of Xerces. + * debian/control: + - Added the missing runtime dependency on libxerces2-java (Closes: #628142) + - Updated Standards-Version to 3.9.4 (no changes) + - Use canonical URLs for the Vcs-* fields + - Removed the article at the beginning of the short description + + -- Emmanuel Bourg <[email protected]> Thu, 25 Jul 2013 15:37:37 +0200 + xom (1.2.1-3) unstable; urgency=low * Team upload. Modified: trunk/xom/debian/control =================================================================== --- trunk/xom/debian/control 2013-07-25 09:37:12 UTC (rev 17061) +++ trunk/xom/debian/control 2013-07-25 13:41:01 UTC (rev 17062) @@ -2,20 +2,21 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Stephan Michels <[email protected]>, Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]> +Uploaders: Stephan Michels <[email protected]>, Varun Hiremath <[email protected]>, + Kumar Appaiah <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: debhelper (>= 5), cdbs, maven-repo-helper Build-Depends-Indep: ant, default-jdk, junit (>= 3.8.1), libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1) -Standards-Version: 3.9.2 -Homepage: http://www.xom.nu/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xom -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xom +Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xom +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xom +Homepage: http://www.xom.nu Package: libxom-java Architecture: all Suggests: libxom-java-doc -Depends: ${misc:Depends}, libjaxen-java (>= 1.1~beta8) -Description: A new XML object model for Java +Depends: ${misc:Depends}, libjaxen-java (>= 1.1~beta8), libxerces2-java +Description: New XML object model for Java XOM(tm) is a new XML object model. It is an open source (LGPL), tree-based API for processing XML with Java that strives for correctness, simplicity, and performance, in that order. Modified: trunk/xom/debian/patches/0001-Remove-jaxen-from-build.patch =================================================================== --- trunk/xom/debian/patches/0001-Remove-jaxen-from-build.patch 2013-07-25 09:37:12 UTC (rev 17061) +++ trunk/xom/debian/patches/0001-Remove-jaxen-from-build.patch 2013-07-25 13:41:01 UTC (rev 17062) @@ -1,16 +1,8 @@ -From: Varun Hiremath <[email protected]> -Date: Thu, 25 Feb 2010 19:59:37 +0100 -Subject: [PATCH] Remove jaxen from build - ---- - build.xml | 50 +------------------------------------------------- - 1 files changed, 1 insertions(+), 49 deletions(-) - -diff --git a/build.xml b/build.xml -index b6992f7..6b77390 100644 +Description: Remove jaxen from build +Author: Varun Hiremath <[email protected]> --- a/build.xml +++ b/build.xml -@@ -56,7 +56,6 @@ subject line. The XOM home page is http://www.xom.nu/ +@@ -68,7 +68,6 @@ <property name="dist.dir" value="./dist"/> <property name="clover.dir" value="./clover"/> <property name="testreports.dir" value="./testreports" /> @@ -18,7 +10,7 @@ <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/> <property name="parser.jar" value="${lib.dir}/dtd-xercesImpl.jar"/> -@@ -93,7 +92,6 @@ subject line. The XOM home page is http://www.xom.nu/ +@@ -107,7 +106,6 @@ <pathelement location="${xml-apis.jar}"/> <pathelement location="${parser.jar}"/> <pathelement location="${junit.jar}"/> @@ -26,7 +18,7 @@ <pathelement location="${servlet.jar}"/> </path> -@@ -101,7 +99,6 @@ subject line. The XOM home page is http://www.xom.nu/ +@@ -115,7 +113,6 @@ <pathelement location="${xml-apis.jar}"/> <pathelement location="${parser.jar}"/> <pathelement location="${xom-core}"/> @@ -34,8 +26,8 @@ <pathelement location="${xslt.jar}"/> <pathelement location="${serializer.jar}"/> </path> -@@ -171,8 +168,6 @@ XOM Build file - <mkdir dir="${dist.dir}"/> +@@ -192,8 +189,6 @@ + <mkdir dir="${dist.dir}/maven2"/> <mkdir dir="${testoutput.dir}"/> <mkdir dir="${build.dir}"/> - <mkdir dir="${build.dir}/jaxen"/> @@ -43,7 +35,7 @@ <mkdir dir="${build15.dir}"/> <mkdir dir="${build.src}"/> <mkdir dir="${build.dest}"/> -@@ -193,7 +188,7 @@ XOM Build file +@@ -214,7 +209,7 @@ </target> @@ -52,68 +44,29 @@ description="Compile the source code"> <javac srcdir="${build.src}" destdir="${build.dest}" -@@ -302,10 +297,6 @@ XOM Build file +@@ -331,12 +326,6 @@ includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class" excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/*"> -- <fileset dir="${jaxen.dir}" -- excludes="**Demo.class **/package.html org/jaxen/xom/** org/jaxen/XPathTestBase.class org/jaxen/jdom/** org/jaxen/dom4j/** org/jaxen/javabean/** org/jaxen/dom/** org/jaxen/**Test.class org/jaxen/saxpath/base/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/pattern/** org/jaxen/saxpath/SAXPathParseException.class org/jaxen/pattern/PriorityTest.class"> -- </fileset> +- <fileset dir="${jaxen.dir}" +- excludes="**Demo.class **/package.html org/jaxen/xom/** org/jaxen/XPathTestBase.class org/jaxen/jdom/** org/jaxen/dom4j/** org/jaxen/javabean/** org/jaxen/dom/** org/jaxen/**Test.class org/jaxen/saxpath/base/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/pattern/** org/jaxen/saxpath/SAXPathParseException.class org/w3c/dom/UserDataHandler.class org/jaxen/pattern/PriorityTest.class"> +- </fileset> +- +- <rule pattern="org.jaxen.**" result="nu.xom.jaxen.@1"/> - <manifest> <attribute name="Built-By" value="${user.name}"/> <attribute name="Specification-Title" value="XOM"/> -@@ -322,12 +313,6 @@ XOM Build file - <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Implementation-Vendor" value="Elliotte Rusty Harold"/> +@@ -368,12 +357,6 @@ + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Implementation-Vendor" value="Elliotte Rusty Harold"/> </section> -- <section name="org/jaxen/"> +- <section name="nu/xom/jaxen/"> - <attribute name="Specification-Title" value="Jaxen XPath engine"/> - <attribute name="Implementation-Title" value="org.jaxen"/> -- <attribute name="Implementation-Version" value="1.1.2"/> +- <attribute name="Implementation-Version" value="${jaxenversion}"/> - <attribute name="Implementation-Vendor" value="CodeHaus"/> - </section> <section name="nu/xom/xslt/"> <attribute name="Sealed" value="true"/> <attribute name="Specification-Title" value="XOM XSLT interface"/> -@@ -699,39 +684,6 @@ location="${dist.dir}/xom-maven-${version}.jar" /> - </jar> - </target> - -- <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen"> -- <javac srcdir="${build.dir}/jaxen-1.1.2/src/java/main" -- destdir="${build.dir}/jaxen-classes" -- debug="${debug}" -- optimize="${optimize}" -- deprecation="${deprecation}" -- target="1.2" -- source="1.3" -- encoding="UTF-8" -- includeAntRuntime="no" -- excludes="org/jaxen/dom/** -- org/jaxen/jdom/** -- org/jaxen/dom4j/** -- org/jaxen/pattern/** -- org/jaxen/javabean/** -- org/jaxen/xom/** -- org/jaxen/function/xslt/** -- org/jaxen/function/ext/** -- org/jaxen/saxpath/expr/DefaultPredicated.java -- org/jaxen/saxpath/helpers/DefaultXPathHandler.java -- org/jaxen/util/StackedIterator.java -- org/jaxen/util/XPath2XMLVisitor.java -- org/jaxen/util/LinkedIterator.java -- org/jaxen/util/SelfAxisIterator.java -- "> -- <classpath refid="compile.class.path"/> -- </javac> -- </target> -- -- <target name="get-jaxen" description="Download Jaxen source code" depends="prepare"> -- <unzip src="jaxen-1.1.2-src.zip" dest="${build.dir}" /> -- </target> -- - <target name="debug" depends="init" description="Print various Ant properties"> - <echoproperties/> - <java classname="org.apache.xalan.Version" fork="yes"> --- Modified: trunk/xom/debian/patches/0002-Remove-a-directory-during-cleaning.patch =================================================================== --- trunk/xom/debian/patches/0002-Remove-a-directory-during-cleaning.patch 2013-07-25 09:37:12 UTC (rev 17061) +++ trunk/xom/debian/patches/0002-Remove-a-directory-during-cleaning.patch 2013-07-25 13:41:01 UTC (rev 17062) @@ -1,16 +1,8 @@ -From: Varun Hiremath <[email protected]> -Date: Thu, 25 Feb 2010 19:59:37 +0100 -Subject: [PATCH] Remove a directory during cleaning - ---- - build.xml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/build.xml b/build.xml -index 6b77390..3a2c462 100644 +Description: Remove a directory during cleaning +Author: Varun Hiremath <[email protected]> --- a/build.xml +++ b/build.xml -@@ -576,6 +576,7 @@ XOM Build file +@@ -695,6 +695,7 @@ <delete> <fileset dir="." includes="junit*properties"/> </delete> @@ -18,4 +10,3 @@ </target> --- Modified: trunk/xom/debian/patches/0003-Add-compile15-to-compile-core-depends.patch =================================================================== --- trunk/xom/debian/patches/0003-Add-compile15-to-compile-core-depends.patch 2013-07-25 09:37:12 UTC (rev 17061) +++ trunk/xom/debian/patches/0003-Add-compile15-to-compile-core-depends.patch 2013-07-25 13:41:01 UTC (rev 17062) @@ -1,16 +1,8 @@ -From: Varun Hiremath <[email protected]> -Date: Thu, 25 Feb 2010 19:59:37 +0100 -Subject: [PATCH] Add compile15 to compile-core depends - ---- - build.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/build.xml b/build.xml -index 3a2c462..66ee3a7 100644 +Description: Add compile15 to compile-core depends +Author: Varun Hiremath <[email protected]> --- a/build.xml +++ b/build.xml -@@ -188,7 +188,7 @@ XOM Build file +@@ -209,7 +209,7 @@ </target> @@ -19,4 +11,3 @@ description="Compile the source code"> <javac srcdir="${build.src}" destdir="${build.dest}" --- Modified: trunk/xom/debian/patches/0004-Remove-sun-imports.patch =================================================================== --- trunk/xom/debian/patches/0004-Remove-sun-imports.patch 2013-07-25 09:37:12 UTC (rev 17061) +++ trunk/xom/debian/patches/0004-Remove-sun-imports.patch 2013-07-25 13:41:01 UTC (rev 17062) @@ -1,11 +1,5 @@ -From: Varun Hiremath <[email protected]> -Date: Thu, 25 Feb 2010 19:59:37 +0100 -Subject: [PATCH] Remove sun imports - ---- - src15/nu/xom/JDK15XML1_0Parser.java | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - +Description: Remove sun imports +Author: Varun Hiremath <[email protected]> diff --git a/src15/nu/xom/JDK15XML1_0Parser.java b/src15/nu/xom/JDK15XML1_0Parser.java index 389d5d7..9ba6056 100644 --- a/src15/nu/xom/JDK15XML1_0Parser.java Modified: trunk/xom/debian/patches/0005-Remove-external-links.patch =================================================================== --- trunk/xom/debian/patches/0005-Remove-external-links.patch 2013-07-25 09:37:12 UTC (rev 17061) +++ trunk/xom/debian/patches/0005-Remove-external-links.patch 2013-07-25 13:41:01 UTC (rev 17062) @@ -1,21 +1,12 @@ -From: Varun Hiremath <[email protected]> -Date: Thu, 25 Feb 2010 19:59:37 +0100 -Subject: [PATCH] Remove external links - ---- - build.xml | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/build.xml b/build.xml -index 66ee3a7..8126f5e 100644 +Description: Remove external links +Author: Varun Hiremath <[email protected]> --- a/build.xml +++ b/build.xml -@@ -378,7 +378,6 @@ XOM Build file +@@ -426,7 +426,6 @@ windowtitle="${Name} ${version} API" docencoding="UTF-8" charset="UTF-8" - link="http://www.junit.org/junit/javadoc/3.8.1"; doctitle="${Name} ${version}" bottom="Copyright 2002-${year} <a href='http://www.elharo.com/'>Elliotte Rusty Harold</a> - <br /> <a href='mailto:elharo%40metalab%2Eunc%2Eedu?Subject=XOM'>elharo@metalab.unc.edu</a>"> --- + <br /> <a href='mailto:elharo%40ibiblio%2Eorg?Subject=XOM'>elharo@ibiblio.org</a>"> Added: trunk/xom/debian/patches/0006-Compile-with-ant-runtime.patch =================================================================== --- trunk/xom/debian/patches/0006-Compile-with-ant-runtime.patch (rev 0) +++ trunk/xom/debian/patches/0006-Compile-with-ant-runtime.patch 2013-07-25 13:41:01 UTC (rev 17062) @@ -0,0 +1,14 @@ +Description: Include the Ant runtime when compiling +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -220,7 +220,7 @@ + source="1.3" + encoding="UTF-8" + fork="true" +- includeAntRuntime="false" ++ includeAntRuntime="true" + excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> + <classpath refid="compile.class.path"/> + </javac> Added: trunk/xom/debian/patches/0007-Remove-jarjar.patch =================================================================== --- trunk/xom/debian/patches/0007-Remove-jarjar.patch (rev 0) +++ trunk/xom/debian/patches/0007-Remove-jarjar.patch 2013-07-25 13:41:01 UTC (rev 17062) @@ -0,0 +1,27 @@ +Description: Use the regular jar Atn yask instead of jarjar. jarjar is used + upstream to relocate the jaxen classes inside the xom jar, but we prefer + to keep it separate in Debian. +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -317,9 +317,7 @@ + + + <target name="jar" depends="compile" description="Create xom.jar"> +- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" +- classpath="${lib.dir}/jarjar-1.0.jar"/> +- <jarjar jarfile="${build.dir}/${name}-${version}.jar" ++ <jar jarfile="${build.dir}/${name}-${version}.jar" + basedir="${build.dest}" + index="no" + compress="yes" +@@ -378,7 +376,7 @@ + <attribute name="Implementation-Title" value="nu.xom.canonical"/> + </section> + </manifest> +- </jarjar> ++ </jar> + + <!-- Put a copy in the dist dir too, because I never remember to upload + the jar from the build directory. --> Modified: trunk/xom/debian/patches/series =================================================================== --- trunk/xom/debian/patches/series 2013-07-25 09:37:12 UTC (rev 17061) +++ trunk/xom/debian/patches/series 2013-07-25 13:41:01 UTC (rev 17062) @@ -1,5 +1,6 @@ 0001-Remove-jaxen-from-build.patch 0002-Remove-a-directory-during-cleaning.patch 0003-Add-compile15-to-compile-core-depends.patch -0004-Remove-sun-imports.patch 0005-Remove-external-links.patch +0006-Compile-with-ant-runtime.patch +0007-Remove-jarjar.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
