[pkg-java] r17068 - in tags/xom: . 1.2.10-1/debian 1.2.10-1/debian/patches 1.2.10-1/debian/poms
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Jul 25 23:02:18 UTC 2013
Author: ebourg-guest
Date: 2013-07-25 23:02:17 +0000 (Thu, 25 Jul 2013)
New Revision: 17068
Added:
tags/xom/1.2.10-1/
tags/xom/1.2.10-1/debian/changelog
tags/xom/1.2.10-1/debian/control
tags/xom/1.2.10-1/debian/patches/0001-Remove-jaxen-from-build.patch
tags/xom/1.2.10-1/debian/patches/0002-Remove-a-directory-during-cleaning.patch
tags/xom/1.2.10-1/debian/patches/0003-Add-compile15-to-compile-core-depends.patch
tags/xom/1.2.10-1/debian/patches/0004-Remove-sun-imports.patch
tags/xom/1.2.10-1/debian/patches/0005-Remove-external-links.patch
tags/xom/1.2.10-1/debian/patches/0006-Compile-with-ant-runtime.patch
tags/xom/1.2.10-1/debian/patches/0007-Remove-jarjar.patch
tags/xom/1.2.10-1/debian/patches/series
tags/xom/1.2.10-1/debian/poms/xom.pom
tags/xom/1.2.10-1/debian/rules
Removed:
tags/xom/1.2.10-1/debian/changelog
tags/xom/1.2.10-1/debian/control
tags/xom/1.2.10-1/debian/patches/0001-Remove-jaxen-from-build.patch
tags/xom/1.2.10-1/debian/patches/0002-Remove-a-directory-during-cleaning.patch
tags/xom/1.2.10-1/debian/patches/0003-Add-compile15-to-compile-core-depends.patch
tags/xom/1.2.10-1/debian/patches/0004-Remove-sun-imports.patch
tags/xom/1.2.10-1/debian/patches/0005-Remove-external-links.patch
tags/xom/1.2.10-1/debian/patches/series
tags/xom/1.2.10-1/debian/poms/xom.pom
tags/xom/1.2.10-1/debian/rules
Log:
[svn-buildpackage] Tagging xom 1.2.10-1
Deleted: tags/xom/1.2.10-1/debian/changelog
===================================================================
--- trunk/xom/debian/changelog 2013-07-25 09:37:12 UTC (rev 17061)
+++ tags/xom/1.2.10-1/debian/changelog 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,90 +0,0 @@
-xom (1.2.1-3) unstable; urgency=low
-
- * Team upload.
-
- [ Torsten Werner ]
- * Remove new patch from last version because gcj was broken.
-
- [ Damien Raude-Morvan ]
- * Apply patch from James Pages <james.page at canonical.com>. Thanks :
- * Enabled maven artifact deployment (LP: #715684) (Closes: #612592).
- - debian/control: Build-Depends added maven-repo-helper
- - debian/rules: install maven artifacts and new target to retrieve
- original POM file.
- - debian/poms/xom.pom: localised pom for maven
- - debian/libxom-java.poms: pom reference locations
- * Update Standards-Version: 3.9.2:
- - Rename debian/README.Debian-source to debian/README.source.
- * Drop Depends on JRE since it's a library (as per Debian Java Policy).
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 25 Apr 2011 14:10:19 +0200
-
-xom (1.2.1-2) unstable; urgency=low
-
- * Convert patches to dep3 format.
- * Add a patch for ant 1.8. (Closes: #571391)
- * Fine tune build dependencies to default-jdk.
- * Convert to source format 3.0.
- * Update Standards-Version: 3.8.4.
-
- -- Torsten Werner <twerner at debian.org> Thu, 25 Feb 2010 20:16:46 +0100
-
-xom (1.2.1-1) unstable; urgency=low
-
- * New upstream release
- * Convert to default-jdk/jre, thanks to Chris Cheney for the patch
- (Closes: #508979)
- * Bump Standards-Version to 3.8.1
- * Switch to quilt for managing patches
-
- -- Varun Hiremath <varun at debian.org> Tue, 05 May 2009 21:10:47 -0400
-
-xom (1.1-3) unstable; urgency=low
-
- * debian/control:
- + Use my debian.org e-mail address.
- + Standards Version is now 3.7.3 (no changes needed.)
- * debian/libxom-java-doc.doc-base:
- + Use "Author" field instead of "Authors".
-
- -- Kumar Appaiah <akumar at debian.org> Mon, 21 Apr 2008 10:10:16 +0530
-
-xom (1.1-2) unstable; urgency=low
-
- [ Torsten Werner ]
- * Fix Depends: libjaxen-java.
-
- [ Varun Hiremath ]
- * Add 05_build.patch to fix javadoc build
- * Add libxom-java-doc.doc-base
- * Clean up debian/rules and remove useless stuff.
- * debian/rules: remove ecj from Build-Depends - not required.
-
- -- Varun Hiremath <varunhiremath at gmail.com> Sun, 25 Nov 2007 15:50:40 +0530
-
-xom (1.1-1) unstable; urgency=low
-
- [ Stephan Michels ]
- * Initial version. Closes: #330238
-
- [ Varun Hiremath ]
- * debian/control:
- + Add myself and Kumar to Uploaders
- + Switch to java-gcj from kaffe
- + Separate out Build-Depends and Indep.
- + Replace ecj-bootstrap with ecj
- + Add Vcs-{Svn, Browser} and Homepage headers.
- * debian/rules:
- + Set JAVA_HOME to java-gcj instead of kaffe
- + Fix Ant build targets.
- + Use cdbs variables.
- + Add get-orig-source target.
- * debian/patches:
- + Add 03_compile15.patch to compile JDK15XML1_0Parser.class
- + Add 04_remove_sun_import.patch to fix imports to use xercesImpl.jar
- * debian/compat: switch to 5
- * Add debian/orig-tar.sh to create orig.tar.gz
- * Add debian/README.Debian-source.
- * Add watch file.
-
- -- Varun Hiremath <varunhiremath at gmail.com> Tue, 13 Nov 2007 15:41:42 +0530
Copied: tags/xom/1.2.10-1/debian/changelog (from rev 17064, trunk/xom/debian/changelog)
===================================================================
--- tags/xom/1.2.10-1/debian/changelog (rev 0)
+++ tags/xom/1.2.10-1/debian/changelog 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,109 @@
+xom (1.2.10-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated the Maven pom
+ * 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.
+ * Moved the samples jar in the documentation package
+ * 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 <ebourg at apache.org> Thu, 25 Jul 2013 15:37:37 +0200
+
+xom (1.2.1-3) unstable; urgency=low
+
+ * Team upload.
+
+ [ Torsten Werner ]
+ * Remove new patch from last version because gcj was broken.
+
+ [ Damien Raude-Morvan ]
+ * Apply patch from James Pages <james.page at canonical.com>. Thanks :
+ * Enabled maven artifact deployment (LP: #715684) (Closes: #612592).
+ - debian/control: Build-Depends added maven-repo-helper
+ - debian/rules: install maven artifacts and new target to retrieve
+ original POM file.
+ - debian/poms/xom.pom: localised pom for maven
+ - debian/libxom-java.poms: pom reference locations
+ * Update Standards-Version: 3.9.2:
+ - Rename debian/README.Debian-source to debian/README.source.
+ * Drop Depends on JRE since it's a library (as per Debian Java Policy).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 25 Apr 2011 14:10:19 +0200
+
+xom (1.2.1-2) unstable; urgency=low
+
+ * Convert patches to dep3 format.
+ * Add a patch for ant 1.8. (Closes: #571391)
+ * Fine tune build dependencies to default-jdk.
+ * Convert to source format 3.0.
+ * Update Standards-Version: 3.8.4.
+
+ -- Torsten Werner <twerner at debian.org> Thu, 25 Feb 2010 20:16:46 +0100
+
+xom (1.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Convert to default-jdk/jre, thanks to Chris Cheney for the patch
+ (Closes: #508979)
+ * Bump Standards-Version to 3.8.1
+ * Switch to quilt for managing patches
+
+ -- Varun Hiremath <varun at debian.org> Tue, 05 May 2009 21:10:47 -0400
+
+xom (1.1-3) unstable; urgency=low
+
+ * debian/control:
+ + Use my debian.org e-mail address.
+ + Standards Version is now 3.7.3 (no changes needed.)
+ * debian/libxom-java-doc.doc-base:
+ + Use "Author" field instead of "Authors".
+
+ -- Kumar Appaiah <akumar at debian.org> Mon, 21 Apr 2008 10:10:16 +0530
+
+xom (1.1-2) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * Fix Depends: libjaxen-java.
+
+ [ Varun Hiremath ]
+ * Add 05_build.patch to fix javadoc build
+ * Add libxom-java-doc.doc-base
+ * Clean up debian/rules and remove useless stuff.
+ * debian/rules: remove ecj from Build-Depends - not required.
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Sun, 25 Nov 2007 15:50:40 +0530
+
+xom (1.1-1) unstable; urgency=low
+
+ [ Stephan Michels ]
+ * Initial version. Closes: #330238
+
+ [ Varun Hiremath ]
+ * debian/control:
+ + Add myself and Kumar to Uploaders
+ + Switch to java-gcj from kaffe
+ + Separate out Build-Depends and Indep.
+ + Replace ecj-bootstrap with ecj
+ + Add Vcs-{Svn, Browser} and Homepage headers.
+ * debian/rules:
+ + Set JAVA_HOME to java-gcj instead of kaffe
+ + Fix Ant build targets.
+ + Use cdbs variables.
+ + Add get-orig-source target.
+ * debian/patches:
+ + Add 03_compile15.patch to compile JDK15XML1_0Parser.class
+ + Add 04_remove_sun_import.patch to fix imports to use xercesImpl.jar
+ * debian/compat: switch to 5
+ * Add debian/orig-tar.sh to create orig.tar.gz
+ * Add debian/README.Debian-source.
+ * Add watch file.
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Tue, 13 Nov 2007 15:41:42 +0530
Deleted: tags/xom/1.2.10-1/debian/control
===================================================================
--- trunk/xom/debian/control 2013-07-25 09:37:12 UTC (rev 17061)
+++ tags/xom/1.2.10-1/debian/control 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,59 +0,0 @@
-Source: xom
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stephan Michels <stephan at apache.org>, Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at debian.org>
-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
-
-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
- 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.
- .
- XOM is designed to be easy to learn and easy to use. It works very
- straight-forwardly, and has a very shallow learning curve. Assuming
- you're already familiar with XML, you should be able to get up and
- running with XOM very quickly.
- .
- XOM is the only XML API that makes no compromises on correctness.
- XOM only accepts namespace well-formed XML documents, and only allows
- you to create namespace well-formed XML documents. (In fact, it's a
- little stricter than that: it actually guarantees that all documents
- are round-trippable and have well-defined XML infosets.) XOM manages
- your XML so you don't have to. With XOM, you can focus on the unique
- value of your application, and trust XOM to get the XML right.
-
-Package: libxom-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libxom-java
-Description: Documentation for the libxom-java package
- 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.
- .
- XOM is designed to be easy to learn and easy to use. It works very
- straight-forwardly, and has a very shallow learning curve. Assuming
- you're already familiar with XML, you should be able to get up and
- running with XOM very quickly.
- .
- XOM is the only XML API that makes no compromises on correctness.
- XOM only accepts namespace well-formed XML documents, and only allows
- you to create namespace well-formed XML documents. (In fact, it's a
- little stricter than that: it actually guarantees that all documents
- are round-trippable and have well-defined XML infosets.) XOM manages
- your XML so you don't have to. With XOM, you can focus on the unique
- value of your application, and trust XOM to get the XML right.
- .
- This package includes the API documentation for libxom-java package.
Copied: tags/xom/1.2.10-1/debian/control (from rev 17062, trunk/xom/debian/control)
===================================================================
--- tags/xom/1.2.10-1/debian/control (rev 0)
+++ tags/xom/1.2.10-1/debian/control 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,60 @@
+Source: xom
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Stephan Michels <stephan at apache.org>, Varun Hiremath <varun at debian.org>,
+ Kumar Appaiah <akumar at debian.org>, Emmanuel Bourg <ebourg at apache.org>
+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.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), 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.
+ .
+ XOM is designed to be easy to learn and easy to use. It works very
+ straight-forwardly, and has a very shallow learning curve. Assuming
+ you're already familiar with XML, you should be able to get up and
+ running with XOM very quickly.
+ .
+ XOM is the only XML API that makes no compromises on correctness.
+ XOM only accepts namespace well-formed XML documents, and only allows
+ you to create namespace well-formed XML documents. (In fact, it's a
+ little stricter than that: it actually guarantees that all documents
+ are round-trippable and have well-defined XML infosets.) XOM manages
+ your XML so you don't have to. With XOM, you can focus on the unique
+ value of your application, and trust XOM to get the XML right.
+
+Package: libxom-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libxom-java
+Description: Documentation for the libxom-java package
+ 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.
+ .
+ XOM is designed to be easy to learn and easy to use. It works very
+ straight-forwardly, and has a very shallow learning curve. Assuming
+ you're already familiar with XML, you should be able to get up and
+ running with XOM very quickly.
+ .
+ XOM is the only XML API that makes no compromises on correctness.
+ XOM only accepts namespace well-formed XML documents, and only allows
+ you to create namespace well-formed XML documents. (In fact, it's a
+ little stricter than that: it actually guarantees that all documents
+ are round-trippable and have well-defined XML infosets.) XOM manages
+ your XML so you don't have to. With XOM, you can focus on the unique
+ value of your application, and trust XOM to get the XML right.
+ .
+ This package includes the API documentation for libxom-java package.
Deleted: tags/xom/1.2.10-1/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)
+++ tags/xom/1.2.10-1/debian/patches/0001-Remove-jaxen-from-build.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,119 +0,0 @@
-From: Varun Hiremath <varun at debian.org>
-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
---- a/build.xml
-+++ b/build.xml
-@@ -56,7 +56,6 @@ subject line. The XOM home page is http://www.xom.nu/
- <property name="dist.dir" value="./dist"/>
- <property name="clover.dir" value="./clover"/>
- <property name="testreports.dir" value="./testreports" />
-- <property name="jaxen.dir" value="${build.dir}/jaxen-classes"/>
-
- <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/
- <pathelement location="${xml-apis.jar}"/>
- <pathelement location="${parser.jar}"/>
- <pathelement location="${junit.jar}"/>
-- <pathelement location="${jaxen.dir}"/>
- <pathelement location="${servlet.jar}"/>
- </path>
-
-@@ -101,7 +99,6 @@ subject line. The XOM home page is http://www.xom.nu/
- <pathelement location="${xml-apis.jar}"/>
- <pathelement location="${parser.jar}"/>
- <pathelement location="${xom-core}"/>
-- <pathelement location="${jaxen.dir}"/>
- <pathelement location="${xslt.jar}"/>
- <pathelement location="${serializer.jar}"/>
- </path>
-@@ -171,8 +168,6 @@ XOM Build file
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${testoutput.dir}"/>
- <mkdir dir="${build.dir}"/>
-- <mkdir dir="${build.dir}/jaxen"/>
-- <mkdir dir="${build.dir}/jaxen-classes"/>
- <mkdir dir="${build15.dir}"/>
- <mkdir dir="${build.src}"/>
- <mkdir dir="${build.dest}"/>
-@@ -193,7 +188,7 @@ XOM Build file
- </target>
-
-
-- <target name="compile-core" depends="prepare, compile-jaxen"
-+ <target name="compile-core" depends="prepare"
- description="Compile the source code">
- <javac srcdir="${build.src}"
- destdir="${build.dest}"
-@@ -302,10 +297,6 @@ XOM Build file
- 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>
--
- <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"/>
- </section>
-- <section name="org/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-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">
---
Copied: tags/xom/1.2.10-1/debian/patches/0001-Remove-jaxen-from-build.patch (from rev 17062, trunk/xom/debian/patches/0001-Remove-jaxen-from-build.patch)
===================================================================
--- tags/xom/1.2.10-1/debian/patches/0001-Remove-jaxen-from-build.patch (rev 0)
+++ tags/xom/1.2.10-1/debian/patches/0001-Remove-jaxen-from-build.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,72 @@
+Description: Remove jaxen from build
+Author: Varun Hiremath <varun at debian.org>
+--- a/build.xml
++++ b/build.xml
+@@ -68,7 +68,6 @@
+ <property name="dist.dir" value="./dist"/>
+ <property name="clover.dir" value="./clover"/>
+ <property name="testreports.dir" value="./testreports" />
+- <property name="jaxen.dir" value="${build.dir}/jaxen-classes"/>
+
+ <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/>
+ <property name="parser.jar" value="${lib.dir}/dtd-xercesImpl.jar"/>
+@@ -107,7 +106,6 @@
+ <pathelement location="${xml-apis.jar}"/>
+ <pathelement location="${parser.jar}"/>
+ <pathelement location="${junit.jar}"/>
+- <pathelement location="${jaxen.dir}"/>
+ <pathelement location="${servlet.jar}"/>
+ </path>
+
+@@ -115,7 +113,6 @@
+ <pathelement location="${xml-apis.jar}"/>
+ <pathelement location="${parser.jar}"/>
+ <pathelement location="${xom-core}"/>
+- <pathelement location="${jaxen.dir}"/>
+ <pathelement location="${xslt.jar}"/>
+ <pathelement location="${serializer.jar}"/>
+ </path>
+@@ -192,8 +189,6 @@
+ <mkdir dir="${dist.dir}/maven2"/>
+ <mkdir dir="${testoutput.dir}"/>
+ <mkdir dir="${build.dir}"/>
+- <mkdir dir="${build.dir}/jaxen"/>
+- <mkdir dir="${build.dir}/jaxen-classes"/>
+ <mkdir dir="${build15.dir}"/>
+ <mkdir dir="${build.src}"/>
+ <mkdir dir="${build.dest}"/>
+@@ -214,7 +209,7 @@
+ </target>
+
+
+- <target name="compile-core" depends="prepare, compile-jaxen"
++ <target name="compile-core" depends="prepare"
+ description="Compile the source code">
+ <javac srcdir="${build.src}"
+ destdir="${build.dest}"
+@@ -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/w3c/dom/UserDataHandler.class org/jaxen/pattern/PriorityTest.class">
+- </fileset>
+-
+- <rule pattern="org.jaxen.**" result="nu.xom.jaxen. at 1"/>
+-
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Specification-Title" value="XOM"/>
+@@ -368,12 +357,6 @@
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="Elliotte Rusty Harold"/>
+ </section>
+- <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="${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"/>
Deleted: tags/xom/1.2.10-1/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)
+++ tags/xom/1.2.10-1/debian/patches/0002-Remove-a-directory-during-cleaning.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,21 +0,0 @@
-From: Varun Hiremath <varun at debian.org>
-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
---- a/build.xml
-+++ b/build.xml
-@@ -576,6 +576,7 @@ XOM Build file
- <delete>
- <fileset dir="." includes="junit*properties"/>
- </delete>
-+ <delete dir="${dist.dir}"/>
- </target>
-
-
---
Copied: tags/xom/1.2.10-1/debian/patches/0002-Remove-a-directory-during-cleaning.patch (from rev 17062, trunk/xom/debian/patches/0002-Remove-a-directory-during-cleaning.patch)
===================================================================
--- tags/xom/1.2.10-1/debian/patches/0002-Remove-a-directory-during-cleaning.patch (rev 0)
+++ tags/xom/1.2.10-1/debian/patches/0002-Remove-a-directory-during-cleaning.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,12 @@
+Description: Remove a directory during cleaning
+Author: Varun Hiremath <varun at debian.org>
+--- a/build.xml
++++ b/build.xml
+@@ -695,6 +695,7 @@
+ <delete>
+ <fileset dir="." includes="junit*properties"/>
+ </delete>
++ <delete dir="${dist.dir}"/>
+ </target>
+
+
Deleted: tags/xom/1.2.10-1/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)
+++ tags/xom/1.2.10-1/debian/patches/0003-Add-compile15-to-compile-core-depends.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,22 +0,0 @@
-From: Varun Hiremath <varun at debian.org>
-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
---- a/build.xml
-+++ b/build.xml
-@@ -188,7 +188,7 @@ XOM Build file
- </target>
-
-
-- <target name="compile-core" depends="prepare"
-+ <target name="compile-core" depends="prepare, compile15"
- description="Compile the source code">
- <javac srcdir="${build.src}"
- destdir="${build.dest}"
---
Copied: tags/xom/1.2.10-1/debian/patches/0003-Add-compile15-to-compile-core-depends.patch (from rev 17062, trunk/xom/debian/patches/0003-Add-compile15-to-compile-core-depends.patch)
===================================================================
--- tags/xom/1.2.10-1/debian/patches/0003-Add-compile15-to-compile-core-depends.patch (rev 0)
+++ tags/xom/1.2.10-1/debian/patches/0003-Add-compile15-to-compile-core-depends.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,13 @@
+Description: Add compile15 to compile-core depends
+Author: Varun Hiremath <varun at debian.org>
+--- a/build.xml
++++ b/build.xml
+@@ -209,7 +209,7 @@
+ </target>
+
+
+- <target name="compile-core" depends="prepare"
++ <target name="compile-core" depends="prepare, compile15"
+ description="Compile the source code">
+ <javac srcdir="${build.src}"
+ destdir="${build.dest}"
Deleted: tags/xom/1.2.10-1/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)
+++ tags/xom/1.2.10-1/debian/patches/0004-Remove-sun-imports.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,37 +0,0 @@
-From: Varun Hiremath <varun at debian.org>
-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(-)
-
-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
-+++ b/src15/nu/xom/JDK15XML1_0Parser.java
-@@ -24,9 +24,9 @@ package nu.xom;
-
- import org.xml.sax.SAXException;
-
--import com.sun.org.apache.xerces.internal.parsers.SAXParser;
--import com.sun.org.apache.xerces.internal.parsers.DTDConfiguration;
--import com.sun.org.apache.xerces.internal.impl.Constants
-+import org.apache.xerces.parsers.SAXParser;
-+import org.apache.xerces.parsers.DTDConfiguration;
-+import org.apache.xerces.impl.Constants
- ;
- /**
- * <p>
-@@ -47,8 +47,8 @@ class JDK15XML1_0Parser extends SAXParser {
-
- super(new DTDConfiguration());
- // workaround for Java 1.5 beta 2 bugs
-- com.sun.org.apache.xerces.internal.util.SecurityManager manager
-- = new com.sun.org.apache.xerces.internal.util.SecurityManager();
-+ org.apache.xerces.util.SecurityManager manager
-+ = new org.apache.xerces.util.SecurityManager();
- setProperty(Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY, manager);
-
- }
---
Copied: tags/xom/1.2.10-1/debian/patches/0004-Remove-sun-imports.patch (from rev 17062, trunk/xom/debian/patches/0004-Remove-sun-imports.patch)
===================================================================
--- tags/xom/1.2.10-1/debian/patches/0004-Remove-sun-imports.patch (rev 0)
+++ tags/xom/1.2.10-1/debian/patches/0004-Remove-sun-imports.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,31 @@
+Description: Remove sun imports
+Author: Varun Hiremath <varun at debian.org>
+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
++++ b/src15/nu/xom/JDK15XML1_0Parser.java
+@@ -24,9 +24,9 @@ package nu.xom;
+
+ import org.xml.sax.SAXException;
+
+-import com.sun.org.apache.xerces.internal.parsers.SAXParser;
+-import com.sun.org.apache.xerces.internal.parsers.DTDConfiguration;
+-import com.sun.org.apache.xerces.internal.impl.Constants
++import org.apache.xerces.parsers.SAXParser;
++import org.apache.xerces.parsers.DTDConfiguration;
++import org.apache.xerces.impl.Constants
+ ;
+ /**
+ * <p>
+@@ -47,8 +47,8 @@ class JDK15XML1_0Parser extends SAXParser {
+
+ super(new DTDConfiguration());
+ // workaround for Java 1.5 beta 2 bugs
+- com.sun.org.apache.xerces.internal.util.SecurityManager manager
+- = new com.sun.org.apache.xerces.internal.util.SecurityManager();
++ org.apache.xerces.util.SecurityManager manager
++ = new org.apache.xerces.util.SecurityManager();
+ setProperty(Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY, manager);
+
+ }
+--
Deleted: tags/xom/1.2.10-1/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)
+++ tags/xom/1.2.10-1/debian/patches/0005-Remove-external-links.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,21 +0,0 @@
-From: Varun Hiremath <varun at debian.org>
-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
---- a/build.xml
-+++ b/build.xml
-@@ -378,7 +378,6 @@ XOM Build file
- 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>">
---
Copied: tags/xom/1.2.10-1/debian/patches/0005-Remove-external-links.patch (from rev 17062, trunk/xom/debian/patches/0005-Remove-external-links.patch)
===================================================================
--- tags/xom/1.2.10-1/debian/patches/0005-Remove-external-links.patch (rev 0)
+++ tags/xom/1.2.10-1/debian/patches/0005-Remove-external-links.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,12 @@
+Description: Remove external links
+Author: Varun Hiremath <varun at debian.org>
+--- a/build.xml
++++ b/build.xml
+@@ -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%40ibiblio%2Eorg?Subject=XOM'>elharo@ibiblio.org</a>">
Copied: tags/xom/1.2.10-1/debian/patches/0006-Compile-with-ant-runtime.patch (from rev 17062, trunk/xom/debian/patches/0006-Compile-with-ant-runtime.patch)
===================================================================
--- tags/xom/1.2.10-1/debian/patches/0006-Compile-with-ant-runtime.patch (rev 0)
+++ tags/xom/1.2.10-1/debian/patches/0006-Compile-with-ant-runtime.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,14 @@
+Description: Include the Ant runtime when compiling
+Author: Emmanuel Bourg <ebourg at apache.org>
+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>
Copied: tags/xom/1.2.10-1/debian/patches/0007-Remove-jarjar.patch (from rev 17062, trunk/xom/debian/patches/0007-Remove-jarjar.patch)
===================================================================
--- tags/xom/1.2.10-1/debian/patches/0007-Remove-jarjar.patch (rev 0)
+++ tags/xom/1.2.10-1/debian/patches/0007-Remove-jarjar.patch 2013-07-25 23:02:17 UTC (rev 17068)
@@ -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 <ebourg at apache.org>
+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. -->
Deleted: tags/xom/1.2.10-1/debian/patches/series
===================================================================
--- trunk/xom/debian/patches/series 2013-07-25 09:37:12 UTC (rev 17061)
+++ tags/xom/1.2.10-1/debian/patches/series 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,5 +0,0 @@
-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
Copied: tags/xom/1.2.10-1/debian/patches/series (from rev 17062, trunk/xom/debian/patches/series)
===================================================================
--- tags/xom/1.2.10-1/debian/patches/series (rev 0)
+++ tags/xom/1.2.10-1/debian/patches/series 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,6 @@
+0001-Remove-jaxen-from-build.patch
+0002-Remove-a-directory-during-cleaning.patch
+0003-Add-compile15-to-compile-core-depends.patch
+0005-Remove-external-links.patch
+0006-Compile-with-ant-runtime.patch
+0007-Remove-jarjar.patch
Deleted: tags/xom/1.2.10-1/debian/poms/xom.pom
===================================================================
--- trunk/xom/debian/poms/xom.pom 2013-07-25 09:37:12 UTC (rev 17061)
+++ tags/xom/1.2.10-1/debian/poms/xom.pom 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <name>XOM</name>
- <version>1.2.1</version>
- <description>The XOM Dual Streaming/Tree API for Processing XML</description>
- <url>http://xom.nu</url>
- <licenses>
- <license>
- <name>The GNU Lesser General Public License, Version 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <url>https://xom.dev.java.net/source/browse/xom/</url>
- </scm>
-
- <artifactId>xom</artifactId>
- <!-- previously used group ID -->
- <groupId>xom</groupId>
-
- <inceptionYear>2002</inceptionYear>
-
- <mailingLists>
- <mailingList>
- <name>XOM Interest Mailing List</name>
- <archive>http://lists.ibiblio.org/pipermail/xom-interest/</archive>
- </mailingList>
- </mailingLists>
-
- <developers>
- <developer>
- <name>Elliotte Rusty Harold</name>
- <id>elharo</id>
- <email>elharo at ibiblio.org</email>
- <organization>Cafe au Lait</organization>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.03</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.0</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- <type>jar</type>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src</sourceDirectory>
- </build>
-
-</project>
Copied: tags/xom/1.2.10-1/debian/poms/xom.pom (from rev 17063, trunk/xom/debian/poms/xom.pom)
===================================================================
--- tags/xom/1.2.10-1/debian/poms/xom.pom (rev 0)
+++ tags/xom/1.2.10-1/debian/poms/xom.pom 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <name>XOM</name>
+ <version>1.2.10</version>
+ <description>The XOM Dual Streaming/Tree API for Processing XML</description>
+ <url>http://xom.nu</url>
+ <licenses>
+ <license>
+ <name>The GNU Lesser General Public License, Version 2.1</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>https://xom.dev.java.net/source/browse/xom/</url>
+ </scm>
+
+ <artifactId>xom</artifactId>
+ <!-- previously used group ID -->
+ <groupId>xom</groupId>
+
+ <inceptionYear>2002</inceptionYear>
+
+ <mailingLists>
+ <mailingList>
+ <name>XOM Interest Mailing List</name>
+ <archive>http://lists.ibiblio.org/pipermail/xom-interest/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <developers>
+ <developer>
+ <name>Elliotte Rusty Harold</name>
+ <id>elharo</id>
+ <email>elharo at ibiblio.org</email>
+ <organization>Cafe au Lait</organization>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.03</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ </build>
+
+</project>
Deleted: tags/xom/1.2.10-1/debian/rules
===================================================================
--- trunk/xom/debian/rules 2013-07-25 09:37:12 UTC (rev 17061)
+++ tags/xom/1.2.10-1/debian/rules 2013-07-25 23:02:17 UTC (rev 17068)
@@ -1,37 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := xercesImpl xalan xml-apis jaxen saxpath junit
-DEB_ANT_BUILD_TARGET := jar samples javadoc
-PACKAGE := xom
-MAVEN_REPO := http://repo1.maven.org/maven2
-
-clean::
- -find -name '*.class' | xargs $(RM)
- -rm build/xom-samples-$(DEB_UPSTREAM_VERSION).jar
- mh_clean
-
-install/libxom-java::
- cp build/xom-samples.jar build/xom-samples-$(DEB_UPSTREAM_VERSION).jar
- dh_install -plibxom-java build/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
- dh_link -plibxom-java /usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xom-samples.jar
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom build/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
-
-install/libxom-java-doc::
- dh_installdocs -plibxom-java-doc build/apidocs
-
-get-orig-source:
- -uscan --upstream-version 0 --rename
-
-get-orig-pom:
- mkdir -p debian/poms
- wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
- $(MAVEN_REPO)/xom/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
-
-
-
-DEB_PHONY_RULES += get-orig-source get-orig-pom
Copied: tags/xom/1.2.10-1/debian/rules (from rev 17064, trunk/xom/debian/rules)
===================================================================
--- tags/xom/1.2.10-1/debian/rules (rev 0)
+++ tags/xom/1.2.10-1/debian/rules 2013-07-25 23:02:17 UTC (rev 17068)
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := xercesImpl xalan xml-apis jaxen saxpath junit
+DEB_ANT_BUILD_TARGET := jar samples javadoc
+PACKAGE := xom
+MAVEN_REPO := http://repo1.maven.org/maven2
+
+clean::
+ -find -name '*.class' | xargs $(RM)
+ -rm build/xom-samples-$(DEB_UPSTREAM_VERSION).jar
+ mh_clean
+
+install/libxom-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom build/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
+
+install/libxom-java-doc::
+ cp build/xom-samples.jar build/xom-samples-$(DEB_UPSTREAM_VERSION).jar
+ dh_install -plibxom-java-doc build/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
+ #dh_link -plibxom-java-doc /usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xom-samples.jar
+ dh_installdocs -plibxom-java-doc build/apidocs
+
+get-orig-source:
+ -uscan --upstream-version 0 --rename
+
+get-orig-pom:
+ mkdir -p debian/poms
+ wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
+ $(MAVEN_REPO)/xom/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+
+
+
+DEB_PHONY_RULES += get-orig-source get-orig-pom
More information about the pkg-java-commits
mailing list