[pkg-java] r11706 - in trunk/xom/debian: . patches source
Torsten Werner
twerner at alioth.debian.org
Thu Feb 25 19:11:36 UTC 2010
Author: twerner
Date: 2010-02-25 19:11:31 +0000 (Thu, 25 Feb 2010)
New Revision: 11706
Added:
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/0006-disable-filtering-for-ant-s-copy-task.patch
trunk/xom/debian/source/
trunk/xom/debian/source/format
Removed:
trunk/xom/debian/patches/01xom-remove-jaxen.patch
trunk/xom/debian/patches/02xom-clean-dist.patch
trunk/xom/debian/patches/03_compile15.patch
trunk/xom/debian/patches/04_remove_sun_import.patch
trunk/xom/debian/patches/05_build.patch
Modified:
trunk/xom/debian/changelog
trunk/xom/debian/control
trunk/xom/debian/patches/series
trunk/xom/debian/rules
Log:
* Non-maintainer upload.
* 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.
Modified: trunk/xom/debian/changelog
===================================================================
--- trunk/xom/debian/changelog 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/changelog 2010-02-25 19:11:31 UTC (rev 11706)
@@ -1,3 +1,13 @@
+xom (1.2.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 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.
+
+ -- Torsten Werner <twerner at debian.org> Thu, 25 Feb 2010 20:10:08 +0100
+
xom (1.2.1-1) unstable; urgency=low
* New upstream release
Modified: trunk/xom/debian/control
===================================================================
--- trunk/xom/debian/control 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/control 2010-02-25 19:11:31 UTC (rev 11706)
@@ -3,8 +3,8 @@
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, quilt
-Build-Depends-Indep: ant, default-jdk-builddep, junit (>= 3.8.1),
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: ant, default-jdk, junit (>= 3.8.1),
libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1)
Standards-Version: 3.8.1
Homepage: http://www.xom.nu/
Added: trunk/xom/debian/patches/0001-Remove-jaxen-from-build.patch
===================================================================
--- trunk/xom/debian/patches/0001-Remove-jaxen-from-build.patch (rev 0)
+++ trunk/xom/debian/patches/0001-Remove-jaxen-from-build.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -0,0 +1,119 @@
+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">
+--
Added: trunk/xom/debian/patches/0002-Remove-a-directory-during-cleaning.patch
===================================================================
--- trunk/xom/debian/patches/0002-Remove-a-directory-during-cleaning.patch (rev 0)
+++ trunk/xom/debian/patches/0002-Remove-a-directory-during-cleaning.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -0,0 +1,21 @@
+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>
+
+
+--
Added: trunk/xom/debian/patches/0003-Add-compile15-to-compile-core-depends.patch
===================================================================
--- trunk/xom/debian/patches/0003-Add-compile15-to-compile-core-depends.patch (rev 0)
+++ trunk/xom/debian/patches/0003-Add-compile15-to-compile-core-depends.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -0,0 +1,22 @@
+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}"
+--
Added: trunk/xom/debian/patches/0004-Remove-sun-imports.patch
===================================================================
--- trunk/xom/debian/patches/0004-Remove-sun-imports.patch (rev 0)
+++ trunk/xom/debian/patches/0004-Remove-sun-imports.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -0,0 +1,37 @@
+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);
+
+ }
+--
Added: trunk/xom/debian/patches/0005-Remove-external-links.patch
===================================================================
--- trunk/xom/debian/patches/0005-Remove-external-links.patch (rev 0)
+++ trunk/xom/debian/patches/0005-Remove-external-links.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -0,0 +1,21 @@
+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>">
+--
Added: trunk/xom/debian/patches/0006-disable-filtering-for-ant-s-copy-task.patch
===================================================================
--- trunk/xom/debian/patches/0006-disable-filtering-for-ant-s-copy-task.patch (rev 0)
+++ trunk/xom/debian/patches/0006-disable-filtering-for-ant-s-copy-task.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Thu, 25 Feb 2010 20:01:30 +0100
+Subject: [PATCH] disable filtering for ant's copy task
+
+---
+ build.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 8126f5e..2f7ab73 100644
+--- a/build.xml
++++ b/build.xml
+@@ -174,7 +174,7 @@ XOM Build file
+
+ <delete file="${build.src}/nu/xom/Text.java" failonerror="false"/>
+
+- <copy todir="${build.src}">
++ <copy todir="${build.src}" filtering="false">
+ <fileset dir="${src.dir}"/>
+ </copy>
+
+--
Deleted: trunk/xom/debian/patches/01xom-remove-jaxen.patch
===================================================================
--- trunk/xom/debian/patches/01xom-remove-jaxen.patch 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/patches/01xom-remove-jaxen.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -1,112 +0,0 @@
-Author: Varun Hiremath
-Description: Remove jaxen from build.
-Index: xom-1.2.1/build.xml
-===================================================================
---- xom-1.2.1.orig/build.xml 2009-05-05 21:08:52.000000000 -0400
-+++ xom-1.2.1/build.xml 2009-05-05 21:08:57.000000000 -0400
-@@ -56,7 +56,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"/>
-@@ -93,7 +92,6 @@
- <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 @@
- <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 @@
- <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 @@
- </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 @@
- 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 @@
- <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 @@
- </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">
Deleted: trunk/xom/debian/patches/02xom-clean-dist.patch
===================================================================
--- trunk/xom/debian/patches/02xom-clean-dist.patch 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/patches/02xom-clean-dist.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -1,14 +0,0 @@
-Author: Varun Hiremath
-Description: Remove a directory during cleaning.
-Index: xom-1.2.1/build.xml
-===================================================================
---- xom-1.2.1.orig/build.xml 2009-05-05 21:08:57.000000000 -0400
-+++ xom-1.2.1/build.xml 2009-05-05 21:09:24.000000000 -0400
-@@ -576,6 +576,7 @@
- <delete>
- <fileset dir="." includes="junit*properties"/>
- </delete>
-+ <delete dir="${dist.dir}"/>
- </target>
-
-
Deleted: trunk/xom/debian/patches/03_compile15.patch
===================================================================
--- trunk/xom/debian/patches/03_compile15.patch 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/patches/03_compile15.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -1,15 +0,0 @@
-Author: Varun Hiremath
-Description: Add compile15 to compile-core depends.
-Index: xom-1.2.1/build.xml
-===================================================================
---- xom-1.2.1.orig/build.xml 2009-05-05 21:05:40.000000000 -0400
-+++ xom-1.2.1/build.xml 2009-05-05 21:06:49.000000000 -0400
-@@ -188,7 +188,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: trunk/xom/debian/patches/04_remove_sun_import.patch
===================================================================
--- trunk/xom/debian/patches/04_remove_sun_import.patch 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/patches/04_remove_sun_import.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -1,29 +0,0 @@
-Author: Varun Hiremath
-Description: Remove sun imports.
-diff -Nur xom-1.1/src15/nu/xom/JDK15XML1_0Parser.java xom-1.1.new/src15/nu/xom/JDK15XML1_0Parser.java
---- xom-1.1/src15/nu/xom/JDK15XML1_0Parser.java 2004-08-17 19:18:30.000000000 +0530
-+++ xom-1.1.new/src15/nu/xom/JDK15XML1_0Parser.java 2007-11-13 15:25:08.000000000 +0530
-@@ -24,9 +24,9 @@
-
- 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 @@
-
- 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: trunk/xom/debian/patches/05_build.patch
===================================================================
--- trunk/xom/debian/patches/05_build.patch 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/patches/05_build.patch 2010-02-25 19:11:31 UTC (rev 11706)
@@ -1,14 +0,0 @@
-Author: Varun Hiremath
-Description: Remove external links
-Index: xom-1.2.1/build.xml
-===================================================================
---- xom-1.2.1.orig/build.xml 2009-05-05 21:04:27.000000000 -0400
-+++ xom-1.2.1/build.xml 2009-05-05 21:04:27.000000000 -0400
-@@ -378,7 +378,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>">
Modified: trunk/xom/debian/patches/series
===================================================================
--- trunk/xom/debian/patches/series 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/patches/series 2010-02-25 19:11:31 UTC (rev 11706)
@@ -1,6 +1,6 @@
-01xom-remove-jaxen.patch
-02xom-clean-dist.patch
-03_compile15.patch
-04_remove_sun_import.patch
-05_build.patch
-
+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-disable-filtering-for-ant-s-copy-task.patch
Modified: trunk/xom/debian/rules
===================================================================
--- trunk/xom/debian/rules 2010-02-25 13:39:42 UTC (rev 11705)
+++ trunk/xom/debian/rules 2010-02-25 19:11:31 UTC (rev 11706)
@@ -4,7 +4,7 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := xercesImpl xalan xml-apis jaxen saxpath junit
DEB_ANT_BUILD_TARGET := jar samples javadoc
Added: trunk/xom/debian/source/format
===================================================================
--- trunk/xom/debian/source/format (rev 0)
+++ trunk/xom/debian/source/format 2010-02-25 19:11:31 UTC (rev 11706)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list