Codebase list xom / 32e3f76
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 Emmanuel Bourg 10 years ago
10 changed file(s) with 99 addition(s) and 119 deletion(s). Raw diff Collapse all Expand all
+17
-0
debian/changelog less more
0 xom (1.2.10-1) unstable; urgency=low
1
2 * New upstream release
3 * Refreshed the patches
4 * Added a patch to include the Ant runtime when compiling
5 * Added a patch to replace jarjar with the regular jar Ant task
6 * Removed 0004-Remove-sun-imports.patch since the JDK15XML1_0Parser is really
7 meant to be used with the parser provided by the JDK and not the standalone
8 version of Xerces.
9 * debian/control:
10 - Added the missing runtime dependency on libxerces2-java (Closes: #628142)
11 - Updated Standards-Version to 3.9.4 (no changes)
12 - Use canonical URLs for the Vcs-* fields
13 - Removed the article at the beginning of the short description
14
15 -- Emmanuel Bourg <ebourg@apache.org> Thu, 25 Jul 2013 15:37:37 +0200
16
017 xom (1.2.1-3) unstable; urgency=low
118
219 * Team upload.
+8
-7
debian/control less more
11 Section: java
22 Priority: optional
33 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
4 Uploaders: Stephan Michels <stephan@apache.org>, Varun Hiremath <varun@debian.org>, Kumar Appaiah <akumar@debian.org>
4 Uploaders: Stephan Michels <stephan@apache.org>, Varun Hiremath <varun@debian.org>,
5 Kumar Appaiah <akumar@debian.org>, Emmanuel Bourg <ebourg@apache.org>
56 Build-Depends: debhelper (>= 5), cdbs, maven-repo-helper
67 Build-Depends-Indep: ant, default-jdk, junit (>= 3.8.1),
78 libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1)
8 Standards-Version: 3.9.2
9 Homepage: http://www.xom.nu/
10 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xom
11 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xom
9 Standards-Version: 3.9.4
10 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xom
11 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xom
12 Homepage: http://www.xom.nu
1213
1314 Package: libxom-java
1415 Architecture: all
1516 Suggests: libxom-java-doc
16 Depends: ${misc:Depends}, libjaxen-java (>= 1.1~beta8)
17 Description: A new XML object model for Java
17 Depends: ${misc:Depends}, libjaxen-java (>= 1.1~beta8), libxerces2-java
18 Description: New XML object model for Java
1819 XOM(tm) is a new XML object model. It is an open source (LGPL),
1920 tree-based API for processing XML with Java that strives for correctness,
2021 simplicity, and performance, in that order.
+19
-66
debian/patches/0001-Remove-jaxen-from-build.patch less more
0 From: Varun Hiremath <varun@debian.org>
1 Date: Thu, 25 Feb 2010 19:59:37 +0100
2 Subject: [PATCH] Remove jaxen from build
3
4 ---
5 build.xml | 50 +-------------------------------------------------
6 1 files changed, 1 insertions(+), 49 deletions(-)
7
8 diff --git a/build.xml b/build.xml
9 index b6992f7..6b77390 100644
0 Description: Remove jaxen from build
1 Author: Varun Hiremath <varun@debian.org>
102 --- a/build.xml
113 +++ b/build.xml
12 @@ -56,7 +56,6 @@ subject line. The XOM home page is http://www.xom.nu/
4 @@ -68,7 +68,6 @@
135 <property name="dist.dir" value="./dist"/>
146 <property name="clover.dir" value="./clover"/>
157 <property name="testreports.dir" value="./testreports" />
179
1810 <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/>
1911 <property name="parser.jar" value="${lib.dir}/dtd-xercesImpl.jar"/>
20 @@ -93,7 +92,6 @@ subject line. The XOM home page is http://www.xom.nu/
12 @@ -107,7 +106,6 @@
2113 <pathelement location="${xml-apis.jar}"/>
2214 <pathelement location="${parser.jar}"/>
2315 <pathelement location="${junit.jar}"/>
2517 <pathelement location="${servlet.jar}"/>
2618 </path>
2719
28 @@ -101,7 +99,6 @@ subject line. The XOM home page is http://www.xom.nu/
20 @@ -115,7 +113,6 @@
2921 <pathelement location="${xml-apis.jar}"/>
3022 <pathelement location="${parser.jar}"/>
3123 <pathelement location="${xom-core}"/>
3325 <pathelement location="${xslt.jar}"/>
3426 <pathelement location="${serializer.jar}"/>
3527 </path>
36 @@ -171,8 +168,6 @@ XOM Build file
37 <mkdir dir="${dist.dir}"/>
28 @@ -192,8 +189,6 @@
29 <mkdir dir="${dist.dir}/maven2"/>
3830 <mkdir dir="${testoutput.dir}"/>
3931 <mkdir dir="${build.dir}"/>
4032 - <mkdir dir="${build.dir}/jaxen"/>
4234 <mkdir dir="${build15.dir}"/>
4335 <mkdir dir="${build.src}"/>
4436 <mkdir dir="${build.dest}"/>
45 @@ -193,7 +188,7 @@ XOM Build file
37 @@ -214,7 +209,7 @@
4638 </target>
4739
4840
5143 description="Compile the source code">
5244 <javac srcdir="${build.src}"
5345 destdir="${build.dest}"
54 @@ -302,10 +297,6 @@ XOM Build file
46 @@ -331,12 +326,6 @@
5547 includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class"
5648 excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/*">
5749
58 - <fileset dir="${jaxen.dir}"
59 - 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">
60 - </fileset>
50 - <fileset dir="${jaxen.dir}"
51 - 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">
52 - </fileset>
53 -
54 - <rule pattern="org.jaxen.**" result="nu.xom.jaxen.@1"/>
6155 -
6256 <manifest>
6357 <attribute name="Built-By" value="${user.name}"/>
6458 <attribute name="Specification-Title" value="XOM"/>
65 @@ -322,12 +313,6 @@ XOM Build file
66 <attribute name="Implementation-Version" value="${version}"/>
67 <attribute name="Implementation-Vendor" value="Elliotte Rusty Harold"/>
59 @@ -368,12 +357,6 @@
60 <attribute name="Implementation-Version" value="${version}"/>
61 <attribute name="Implementation-Vendor" value="Elliotte Rusty Harold"/>
6862 </section>
69 - <section name="org/jaxen/">
63 - <section name="nu/xom/jaxen/">
7064 - <attribute name="Specification-Title" value="Jaxen XPath engine"/>
7165 - <attribute name="Implementation-Title" value="org.jaxen"/>
72 - <attribute name="Implementation-Version" value="1.1.2"/>
66 - <attribute name="Implementation-Version" value="${jaxenversion}"/>
7367 - <attribute name="Implementation-Vendor" value="CodeHaus"/>
7468 - </section>
7569 <section name="nu/xom/xslt/">
7670 <attribute name="Sealed" value="true"/>
7771 <attribute name="Specification-Title" value="XOM XSLT interface"/>
78 @@ -699,39 +684,6 @@ location="${dist.dir}/xom-maven-${version}.jar" />
79 </jar>
80 </target>
81
82 - <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
83 - <javac srcdir="${build.dir}/jaxen-1.1.2/src/java/main"
84 - destdir="${build.dir}/jaxen-classes"
85 - debug="${debug}"
86 - optimize="${optimize}"
87 - deprecation="${deprecation}"
88 - target="1.2"
89 - source="1.3"
90 - encoding="UTF-8"
91 - includeAntRuntime="no"
92 - excludes="org/jaxen/dom/**
93 - org/jaxen/jdom/**
94 - org/jaxen/dom4j/**
95 - org/jaxen/pattern/**
96 - org/jaxen/javabean/**
97 - org/jaxen/xom/**
98 - org/jaxen/function/xslt/**
99 - org/jaxen/function/ext/**
100 - org/jaxen/saxpath/expr/DefaultPredicated.java
101 - org/jaxen/saxpath/helpers/DefaultXPathHandler.java
102 - org/jaxen/util/StackedIterator.java
103 - org/jaxen/util/XPath2XMLVisitor.java
104 - org/jaxen/util/LinkedIterator.java
105 - org/jaxen/util/SelfAxisIterator.java
106 - ">
107 - <classpath refid="compile.class.path"/>
108 - </javac>
109 - </target>
110 -
111 - <target name="get-jaxen" description="Download Jaxen source code" depends="prepare">
112 - <unzip src="jaxen-1.1.2-src.zip" dest="${build.dir}" />
113 - </target>
114 -
115 <target name="debug" depends="init" description="Print various Ant properties">
116 <echoproperties/>
117 <java classname="org.apache.xalan.Version" fork="yes">
118 --
+3
-12
debian/patches/0002-Remove-a-directory-during-cleaning.patch less more
0 From: Varun Hiremath <varun@debian.org>
1 Date: Thu, 25 Feb 2010 19:59:37 +0100
2 Subject: [PATCH] Remove a directory during cleaning
3
4 ---
5 build.xml | 1 +
6 1 files changed, 1 insertions(+), 0 deletions(-)
7
8 diff --git a/build.xml b/build.xml
9 index 6b77390..3a2c462 100644
0 Description: Remove a directory during cleaning
1 Author: Varun Hiremath <varun@debian.org>
102 --- a/build.xml
113 +++ b/build.xml
12 @@ -576,6 +576,7 @@ XOM Build file
4 @@ -695,6 +695,7 @@
135 <delete>
146 <fileset dir="." includes="junit*properties"/>
157 </delete>
179 </target>
1810
1911
20 --
+3
-12
debian/patches/0003-Add-compile15-to-compile-core-depends.patch less more
0 From: Varun Hiremath <varun@debian.org>
1 Date: Thu, 25 Feb 2010 19:59:37 +0100
2 Subject: [PATCH] Add compile15 to compile-core depends
3
4 ---
5 build.xml | 2 +-
6 1 files changed, 1 insertions(+), 1 deletions(-)
7
8 diff --git a/build.xml b/build.xml
9 index 3a2c462..66ee3a7 100644
0 Description: Add compile15 to compile-core depends
1 Author: Varun Hiremath <varun@debian.org>
102 --- a/build.xml
113 +++ b/build.xml
12 @@ -188,7 +188,7 @@ XOM Build file
4 @@ -209,7 +209,7 @@
135 </target>
146
157
1810 description="Compile the source code">
1911 <javac srcdir="${build.src}"
2012 destdir="${build.dest}"
21 --
+2
-8
debian/patches/0004-Remove-sun-imports.patch less more
0 From: Varun Hiremath <varun@debian.org>
1 Date: Thu, 25 Feb 2010 19:59:37 +0100
2 Subject: [PATCH] Remove sun imports
3
4 ---
5 src15/nu/xom/JDK15XML1_0Parser.java | 10 +++++-----
6 1 files changed, 5 insertions(+), 5 deletions(-)
7
0 Description: Remove sun imports
1 Author: Varun Hiremath <varun@debian.org>
82 diff --git a/src15/nu/xom/JDK15XML1_0Parser.java b/src15/nu/xom/JDK15XML1_0Parser.java
93 index 389d5d7..9ba6056 100644
104 --- a/src15/nu/xom/JDK15XML1_0Parser.java
+4
-13
debian/patches/0005-Remove-external-links.patch less more
0 From: Varun Hiremath <varun@debian.org>
1 Date: Thu, 25 Feb 2010 19:59:37 +0100
2 Subject: [PATCH] Remove external links
3
4 ---
5 build.xml | 1 -
6 1 files changed, 0 insertions(+), 1 deletions(-)
7
8 diff --git a/build.xml b/build.xml
9 index 66ee3a7..8126f5e 100644
0 Description: Remove external links
1 Author: Varun Hiremath <varun@debian.org>
102 --- a/build.xml
113 +++ b/build.xml
12 @@ -378,7 +378,6 @@ XOM Build file
4 @@ -426,7 +426,6 @@
135 windowtitle="${Name} ${version} API"
146 docencoding="UTF-8"
157 charset="UTF-8"
168 - link="http://www.junit.org/junit/javadoc/3.8.1"
179 doctitle="${Name} ${version}"
1810 bottom="Copyright 2002-${year} &lt;a href='http://www.elharo.com/'&gt;Elliotte Rusty Harold&lt;/a&gt;
19 &lt;br /&gt; &lt;a href='&#109;&#97;&#105;&#108;&#116;&#111;&#58;elharo%40metalab%2Eunc%2Eedu?Subject=XOM'&gt;elharo&#64;metalab&#46;unc&#46;edu&lt;/a&gt;">
20 --
11 &lt;br /&gt; &lt;a href='&#109;&#97;&#105;&#108;&#116;&#111;&#58;elharo%40ibiblio%2Eorg?Subject=XOM'&gt;elharo&#64;ibiblio&#46;org&lt;/a&gt;">
+14
-0
debian/patches/0006-Compile-with-ant-runtime.patch less more
0 Description: Include the Ant runtime when compiling
1 Author: Emmanuel Bourg <ebourg@apache.org>
2 Forwarded: not-needed
3 --- a/build.xml
4 +++ b/build.xml
5 @@ -220,7 +220,7 @@
6 source="1.3"
7 encoding="UTF-8"
8 fork="true"
9 - includeAntRuntime="false"
10 + includeAntRuntime="true"
11 excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
12 <classpath refid="compile.class.path"/>
13 </javac>
+27
-0
debian/patches/0007-Remove-jarjar.patch less more
0 Description: Use the regular jar Atn yask instead of jarjar. jarjar is used
1 upstream to relocate the jaxen classes inside the xom jar, but we prefer
2 to keep it separate in Debian.
3 Author: Emmanuel Bourg <ebourg@apache.org>
4 Forwarded: not-needed
5 --- a/build.xml
6 +++ b/build.xml
7 @@ -317,9 +317,7 @@
8
9
10 <target name="jar" depends="compile" description="Create xom.jar">
11 - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
12 - classpath="${lib.dir}/jarjar-1.0.jar"/>
13 - <jarjar jarfile="${build.dir}/${name}-${version}.jar"
14 + <jar jarfile="${build.dir}/${name}-${version}.jar"
15 basedir="${build.dest}"
16 index="no"
17 compress="yes"
18 @@ -378,7 +376,7 @@
19 <attribute name="Implementation-Title" value="nu.xom.canonical"/>
20 </section>
21 </manifest>
22 - </jarjar>
23 + </jar>
24
25 <!-- Put a copy in the dist dir too, because I never remember to upload
26 the jar from the build directory. -->
+2
-1
debian/patches/series less more
00 0001-Remove-jaxen-from-build.patch
11 0002-Remove-a-directory-during-cleaning.patch
22 0003-Add-compile15-to-compile-core-depends.patch
3 0004-Remove-sun-imports.patch
43 0005-Remove-external-links.patch
4 0006-Compile-with-ant-runtime.patch
5 0007-Remove-jarjar.patch