[pkg-java] r17007 - in trunk/xmlbeans/debian: . patches poms
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Wed Jul 10 14:32:38 UTC 2013
Author: ebourg-guest
Date: 2013-07-10 14:32:37 +0000 (Wed, 10 Jul 2013)
New Revision: 17007
Modified:
trunk/xmlbeans/debian/changelog
trunk/xmlbeans/debian/control
trunk/xmlbeans/debian/patches/build-xml.patch
trunk/xmlbeans/debian/poms/qname.xml
trunk/xmlbeans/debian/poms/xmlbeans.xml
trunk/xmlbeans/debian/poms/xpath.xml
trunk/xmlbeans/debian/rules
Log:
New upstream release (2.6.0)
Refreshed the patches
Updated the poms
Use canonical URLs for the Vcs-* fields
Updated Standards-Version to 3.9.4 (no changes)
debian/rules: Updated the URL of the Maven repository used to fetch the poms
debian/rules: Improved the clean target
Modified: trunk/xmlbeans/debian/changelog
===================================================================
--- trunk/xmlbeans/debian/changelog 2013-07-09 21:26:43 UTC (rev 17006)
+++ trunk/xmlbeans/debian/changelog 2013-07-10 14:32:37 UTC (rev 17007)
@@ -1,3 +1,15 @@
+xmlbeans (2.6.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Refreshed the patches
+ * Updated the poms
+ * Use canonical URLs for the Vcs-* fields
+ * Updated Standards-Version to 3.9.4 (no changes)
+ * debian/rules: Updated the URL of the Maven repository used to fetch the poms
+ * debian/rules: Improved the clean target
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 10 Jul 2013 16:31:35 +0200
+
xmlbeans (2.5.0-4) unstable; urgency=low
* d/rules Fix installation of Maven artifacts into /usr/share/maven-repo/.
Modified: trunk/xmlbeans/debian/control
===================================================================
--- trunk/xmlbeans/debian/control 2013-07-09 21:26:43 UTC (rev 17006)
+++ trunk/xmlbeans/debian/control 2013-07-10 14:32:37 UTC (rev 17007)
@@ -2,14 +2,14 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
Build-Depends-Indep: ant-optional, libxmlbeans-java,
libsaxonb-java, maven-repo-helper
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xmlbeans/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xmlbeans/
-Homepage: http://xmlbeans.apache.org/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xmlbeans/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xmlbeans/
+Homepage: http://xmlbeans.apache.org
Package: libxmlbeans-java
Architecture: all
Modified: trunk/xmlbeans/debian/patches/build-xml.patch
===================================================================
--- trunk/xmlbeans/debian/patches/build-xml.patch 2013-07-09 21:26:43 UTC (rev 17006)
+++ trunk/xmlbeans/debian/patches/build-xml.patch 2013-07-10 14:32:37 UTC (rev 17007)
@@ -5,213 +5,212 @@
--- a/build.xml
+++ b/build.xml
@@ -237,7 +237,7 @@
- <!-- oldxbean.jar target =========================================== -->
-
- <target name="oldxbean.jar">
-- <copy file="external/lib/oldxbean.jar" tofile="build/private/lib/oldxbean.jar"/>
-+ <copy file="/usr/share/java/xmlbeans.jar" tofile="build/private/lib/oldxbean.jar"/>
- </target>
-
- <!-- bootstrap target ============================================== -->
-@@ -483,7 +483,7 @@
- typeimpl.classes, xmlcomp.classes,
- store.classes, saaj_api.classes,
- marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
-- xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
-+ xmlinputstream.classes, xbean_xpath.jar,
- piccolo.classes, tools.classes, jamsupport.classes">
- <jar jarfile="build/lib/xbean.jar" index="true">
- <fileset dir="build/classes/xmlpublic"
-@@ -539,12 +539,12 @@
-
- <!-- xmlpublic target ============================================== -->
-
-- <target name="xmlpublic.classes" depends="dirs, xmlinputstream.classes, jsr173_1.0.jars">
-+ <target name="xmlpublic.classes" depends="dirs, xmlinputstream.classes">
- <mkdir dir="build/classes/xmlpublic"/>
- <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath>
- <pathelement location="build/classes/xmlinputstream"/>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- </classpath>
- </javac>
-
-@@ -581,7 +581,7 @@
- <mkdir dir="build/classes/typestore"/>
- <javac srcdir="src/typestore" destdir="build/classes/typestore" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/common"/>
-@@ -592,11 +592,11 @@
-
- <!-- common target ============================================= -->
-
-- <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes, jsr173_1.0.jars">
-+ <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes">
- <mkdir dir="build/classes/common"/>
- <javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
- </classpath>
-@@ -634,7 +634,7 @@
-
- <target name="typeimpl.classes" depends="dirs, store.classes,
- repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
-- configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes">
-+ configschema.classes, toolschema.classes, jam.classes">
- <mkdir dir="build/classes/typeimpl"/>
- <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath>
-@@ -650,7 +650,7 @@
- <pathelement location="build/classes/xmlschema"/>
- <pathelement location="build/classes/toolschema"/>
- <pathelement location="build/classes/jam"/>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- </classpath>
-
- <src path="src/typeimpl"/>
-@@ -676,7 +676,7 @@
- <mkdir dir="build/classes/xmlcomp"/>
- <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/common"/>
-@@ -692,11 +692,11 @@
-
- <!-- marshal target =============================================== -->
-
-- <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes, jsr173_1.0.jars">
-+ <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes">
- <mkdir dir="build/classes/marshal"/>
- <javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- <pathelement location="build/classes/configschema"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
-@@ -738,7 +738,7 @@
- <javac srcdir="src/store" destdir="build/classes/store" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath id="store.compile.path">
- <pathelement location="build/classes/typestore"/>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/common"/>
-@@ -757,7 +757,7 @@
- <javac srcdir="src/tools" destdir="build/classes/tools" source="${javac.source}" target="${javac.target}" debug="on">
- <classpath id="tools.compile.path">
- <pathelement location="build/classes/typestore"/>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/common"/>
-@@ -779,13 +779,13 @@
-
- <path id="bootstrap.run.path">
- <pathelement location="build/private/lib/oldxbean.jar"/>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- <pathelement location="build/classes/xmlpublic"/>
- </path>
-
- <path id="bootstrap.compile.path">
- <pathelement location="build/classes/xmlpublic"/>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- </path>
-
- <property name="bootstrap.compile.path" refid="bootstrap.compile.path"/>
-@@ -829,7 +829,7 @@
- </condition>
- </target>
-
-- <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar, jsr173_1.0.jars" unless="xmlschema.notRequired">
-+ <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar" unless="xmlschema.notRequired">
- <delete dir="build/classes/xmlschema"/>
- <delete dir="build/src/xmlschema"/>
- <java classname="${bootstrap_schema_compiler}" classpathref="bootstrap.run.path" fork="true" failonerror="true">
-@@ -972,7 +972,7 @@
-
- <!-- xpath target ============================================= -->
-
-- <target name="xpath.classes" depends="dirs, xmlpublic.classes, store.classes, saxon9.jar">
-+ <target name="xpath.classes" depends="dirs, xmlpublic.classes, store.classes">
- <mkdir dir="build/classes/xpath_xquery"/>
- <mkdir dir="build/classes/xpath_xquery/META-INF"/>
- <mkdir dir="build/classes/xpath_xquery/META-INF/services"/>
-@@ -991,8 +991,8 @@
- <classpath id="xpath.compile.path">
- <pathelement location="build/classes/xmlpublic"/>
- <pathelement location="build/classes/store"/>
-- <pathelement location="${saxon_jar}"/>
-- <pathelement location="${saxon_dom_jar}"/>
-+ <pathelement location="/usr/share/java/saxonb.jar"/>
-+ <pathelement location="/usr/share/java/saxonb-dom.jar"/>
- </classpath>
- </javac>
- </target>
-@@ -1053,19 +1053,19 @@
- <path id="test.compile.path">
- <pathelement location="build/classes/marshal"/>
- <pathelement location="build/classes/common"/>
-- <pathelement location="external/lib/junit.jar"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
- <pathelement location="build/ar/xbean.jar"/>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- <pathelement location="build/classes/xmlinputstream"/>
- </path>
-
- <path id="test.run.path">
- <pathelement location="build/ar/xbean.jar"/>
-- <pathelement location="external/lib/junit.jar"/>
-+ <pathelement location="/usr/share/java/junit.jar"/>
- </path>
-
-
-- <target name="drt.classes" depends="dirs,jsr173_1.0.jars">
-+ <target name="drt.classes" depends="dirs">
- <mkdir dir="build/private/classes/drt"/>
- <javac
- destdir="build/private/classes/drt"
-@@ -1085,7 +1085,7 @@
-
- <path id="scomp.run.path">
- <pathelement location="build/lib/xbean.jar"/>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- </path>
-
- <target name="stsschema.check">
-@@ -1110,7 +1110,7 @@
- </uptodate>
- </target>
-
-- <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes, jsr173_1.0.jars" unless="jam.classes.notRequired">
-+ <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes" unless="jam.classes.notRequired">
- <delete dir="build/private/jam"/>
- <mkdir dir="build/private/jam"/>
- <unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>
-@@ -1133,7 +1133,7 @@
- debug="on">
- <src path="build/private/jam/src_repackage"/>
- <classpath>
-- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-+ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
- </classpath>
- </javac>
- </target>
+ <!-- oldxbean.jar target =========================================== -->
+
+ <target name="oldxbean.jar">
+- <copy file="external/lib/oldxbean.jar" tofile="build/private/lib/oldxbean.jar"/>
++ <copy file="/usr/share/java/xmlbeans.jar" tofile="build/private/lib/oldxbean.jar"/>
+ </target>
+
+ <!-- bootstrap target ============================================== -->
+@@ -487,7 +487,7 @@
+ typeimpl.classes, xmlcomp.classes,
+ store.classes, saaj_api.classes,
+ marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
+- xmlinputstream.classes, resolver.jar, xbean_xpath.jar,
++ xmlinputstream.classes, xbean_xpath.jar,
+ piccolo.classes, tools.classes, jamsupport.classes">
+ <jar jarfile="build/lib/xbean.jar" index="true">
+ <fileset dir="build/classes/xmlpublic"
+@@ -545,11 +545,11 @@
+
+ <!-- xmlpublic target ============================================== -->
+
+- <target name="xmlpublic.classes" depends="dirs, jsr173_1.0.jars">
++ <target name="xmlpublic.classes" depends="dirs">
+ <mkdir dir="build/classes/xmlpublic"/>
+ <javac srcdir="src/xmlpublic" sourcepath="src/xmlinputstream" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" debug="on">
+ <classpath>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ </classpath>
+ </javac>
+
+@@ -586,7 +586,7 @@
+ <mkdir dir="build/classes/typestore"/>
+ <javac srcdir="src/typestore" destdir="build/classes/typestore" source="${javac.source}" target="${javac.target}" debug="on">
+ <classpath>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+ <pathelement location="build/classes/xmlpublic"/>
+ <pathelement location="build/classes/common"/>
+@@ -597,11 +597,11 @@
+
+ <!-- common target ============================================= -->
+
+- <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes, jsr173_1.0.jars">
++ <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes">
+ <mkdir dir="build/classes/common"/>
+ <javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
+ <classpath>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+ <pathelement location="build/classes/xmlpublic"/>
+ </classpath>
+@@ -639,7 +639,7 @@
+
+ <target name="typeimpl.classes" depends="dirs, store.classes,
+ repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
+- configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes">
++ configschema.classes, toolschema.classes, jam.classes">
+ <mkdir dir="build/classes/typeimpl"/>
+ <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
+ <classpath>
+@@ -655,7 +655,7 @@
+ <pathelement location="build/classes/xmlschema"/>
+ <pathelement location="build/classes/toolschema"/>
+ <pathelement location="build/classes/jam"/>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ </classpath>
+
+ <src path="src/typeimpl"/>
+@@ -681,7 +681,7 @@
+ <mkdir dir="build/classes/xmlcomp"/>
+ <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="${javac.source}" target="${javac.target}" debug="on">
+ <classpath>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+ <pathelement location="build/classes/xmlpublic"/>
+ <pathelement location="build/classes/common"/>
+@@ -697,11 +697,11 @@
+
+ <!-- marshal target =============================================== -->
+
+- <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes, jsr173_1.0.jars">
++ <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes">
+ <mkdir dir="build/classes/marshal"/>
+ <javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
+ <classpath>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ <pathelement location="build/classes/configschema"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+ <pathelement location="build/classes/xmlpublic"/>
+@@ -743,7 +743,7 @@
+ <javac srcdir="src/store" destdir="build/classes/store" source="${javac.source}" target="${javac.target}" debug="on">
+ <classpath id="store.compile.path">
+ <pathelement location="build/classes/typestore"/>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+ <pathelement location="build/classes/xmlpublic"/>
+ <pathelement location="build/classes/common"/>
+@@ -762,7 +762,7 @@
+ <javac srcdir="src/tools" destdir="build/classes/tools" source="${javac.source}" target="${javac.target}" debug="on">
+ <classpath id="tools.compile.path">
+ <pathelement location="build/classes/typestore"/>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+ <pathelement location="build/classes/xmlpublic"/>
+ <pathelement location="build/classes/common"/>
+@@ -784,13 +784,13 @@
+
+ <path id="bootstrap.run.path">
+ <pathelement location="build/private/lib/oldxbean.jar"/>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ <pathelement location="build/classes/xmlpublic"/>
+ </path>
+
+ <path id="bootstrap.compile.path">
+ <pathelement location="build/classes/xmlpublic"/>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ </path>
+
+ <property name="bootstrap.compile.path" refid="bootstrap.compile.path"/>
+@@ -834,7 +834,7 @@
+ </condition>
+ </target>
+
+- <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar, jsr173_1.0.jars" unless="xmlschema.notRequired">
++ <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar" unless="xmlschema.notRequired">
+ <delete dir="build/classes/xmlschema"/>
+ <delete dir="build/src/xmlschema"/>
+ <java classname="${bootstrap_schema_compiler}" classpathref="bootstrap.run.path" fork="true" failonerror="true">
+@@ -977,7 +977,7 @@
+
+ <!-- xpath target ============================================= -->
+
+- <target name="xpath.classes" depends="dirs, xmlpublic.classes, store.classes, saxon9.jar">
++ <target name="xpath.classes" depends="dirs, xmlpublic.classes, store.classes">
+ <mkdir dir="build/classes/xpath_xquery"/>
+ <mkdir dir="build/classes/xpath_xquery/META-INF"/>
+ <mkdir dir="build/classes/xpath_xquery/META-INF/services"/>
+@@ -996,8 +996,8 @@
+ <classpath id="xpath.compile.path">
+ <pathelement location="build/classes/xmlpublic"/>
+ <pathelement location="build/classes/store"/>
+- <pathelement location="${saxon_jar}"/>
+- <pathelement location="${saxon_dom_jar}"/>
++ <pathelement location="/usr/share/java/saxonb.jar"/>
++ <pathelement location="/usr/share/java/saxonb-dom.jar"/>
+ </classpath>
+ </javac>
+ </target>
+@@ -1061,19 +1061,19 @@
+ <path id="test.compile.path">
+ <pathelement location="build/classes/marshal"/>
+ <pathelement location="build/classes/common"/>
+- <pathelement location="external/lib/junit.jar"/>
++ <pathelement location="/usr/share/java/junit.jar"/>
+ <pathelement location="build/ar/xbean.jar"/>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+ </path>
+
+ <path id="test.run.path">
+ <pathelement location="build/ar/xbean.jar"/>
+- <pathelement location="external/lib/junit.jar"/>
++ <pathelement location="/usr/share/java/junit.jar"/>
+ </path>
+
+
+- <target name="drt.classes" depends="dirs,jsr173_1.0.jars">
++ <target name="drt.classes" depends="dirs">
+ <mkdir dir="build/private/classes/drt"/>
+ <javac
+ destdir="build/private/classes/drt"
+@@ -1093,7 +1093,7 @@
+
+ <path id="scomp.run.path">
+ <pathelement location="build/lib/xbean.jar"/>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ </path>
+
+ <target name="stsschema.check">
+@@ -1118,7 +1118,7 @@
+ </uptodate>
+ </target>
+
+- <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes, jsr173_1.0.jars" unless="jam.classes.notRequired">
++ <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes" unless="jam.classes.notRequired">
+ <delete dir="build/private/jam"/>
+ <mkdir dir="build/private/jam"/>
+ <unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>
+@@ -1141,7 +1141,7 @@
+ debug="on">
+ <src path="build/private/jam/src_repackage"/>
+ <classpath>
+- <pathelement location="build/lib/jsr173_1.0_api.jar"/>
++ <pathelement location="/usr/share/java/geronimo-stax-1.0-spec.jar"/>
+ </classpath>
+ </javac>
+ </target>
Modified: trunk/xmlbeans/debian/poms/qname.xml
===================================================================
--- trunk/xmlbeans/debian/poms/qname.xml 2013-07-09 21:26:43 UTC (rev 17006)
+++ trunk/xmlbeans/debian/poms/qname.xml 2013-07-10 14:32:37 UTC (rev 17007)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans-qname</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0</version>
<name>XmlBeans</name>
<description>Jar that enables XmlBeans to run under JDK 1.4</description>
@@ -57,83 +57,34 @@
<developer>
<name>Cezar Andrei</name>
<id>cezar</id>
- <email>cezar.andrei at no#spam#!bea.com</email>
+ <email>cezar.andrei at no#spam#!gma|l.com</email>
<organization></organization>
</developer>
<developer>
- <name>David Bau</name>
- <id>dbau</id>
- <email>david.bau at no#spam.google.com</email>
+ <name>Radu Preotiuc</name>
+ <id>radup</id>
+ <email>radupr at nos#pam.gm at il.com</email>
<organization></organization>
</developer>
<developer>
- <name>Patrick Calahan</name>
- <id></id>
- <email>pcal at no#spam.bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Yana Kadiyska</name>
- <id></id>
- <email>ykadiysk at no#spam#!bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Ken Kress</name>
- <id></id>
- <email>ken at nos#pam.kress.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Kevin Krouse</name>
- <id></id>
- <email>kkrouse at n#osp#am.apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Laurence Moroney</name>
- <id></id>
- <email>laurence.moroney at nospa#m.reuters.com</email>
- <organization></organization>
- </developer>
- <developer>
<name>Radu Preotiuc</name>
<id>radup</id>
<email>radu.preotiuc-pietro at nos#pam.bea.com</email>
<organization></organization>
</developer>
<developer>
- <name>Cliff Schmidt</name>
- <id></id>
- <email>cliffschmidt at n#osp#am!gmail.com</email>
+ <name>Wing Yew Poon</name>
+ <id>wpoon</id>
+ <email>wing-yew.poon at nos#pam.oracle.com</email>
<organization></organization>
</developer>
<developer>
- <name>Dutta Satadip</name>
- <id></id>
- <email>s-dutta at no#spam.sbcglobal.net</email>
+ <name>Jacob Danner</name>
+ <id>jdanner</id>
+ <email>jacob.danner at nos#pam.oracle.com</email>
<organization></organization>
</developer>
- <developer>
- <name>Eric Vasilik</name>
- <id></id>
- <email>eric at nos#pam.vasilik.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>David Waite</name>
- <id></id>
- <email>dwaite at no#spam.apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Scott Ziegler</name>
- <id></id>
- <email>scott.ziegler at n#ospam.bea.com</email>
- <organization></organization>
- </developer>
-
</developers>
<dependencies>
Modified: trunk/xmlbeans/debian/poms/xmlbeans.xml
===================================================================
--- trunk/xmlbeans/debian/poms/xmlbeans.xml 2013-07-09 21:26:43 UTC (rev 17006)
+++ trunk/xmlbeans/debian/poms/xmlbeans.xml 2013-07-10 14:32:37 UTC (rev 17007)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0</version>
<name>XmlBeans</name>
<description>XmlBeans main jar</description>
@@ -57,82 +57,34 @@
<developer>
<name>Cezar Andrei</name>
<id>cezar</id>
- <email>cezar.andrei at no#spam#!bea.com</email>
+ <email>cezar.andrei at no#spam#!gma|l.com</email>
<organization></organization>
</developer>
<developer>
- <name>David Bau</name>
- <id>dbau</id>
- <email>david.bau at no#spam.google.com</email>
+ <name>Radu Preotiuc</name>
+ <id>radup</id>
+ <email>radupr at nos#pam.gm at il.com</email>
<organization></organization>
</developer>
<developer>
- <name>Patrick Calahan</name>
- <id></id>
- <email>pcal at no#spam.bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Yana Kadiyska</name>
- <id></id>
- <email>ykadiysk at no#spam#!bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Ken Kress</name>
- <id></id>
- <email>ken at nos#pam.kress.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Kevin Krouse</name>
- <id></id>
- <email>kkrouse at n#osp#am.apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Laurence Moroney</name>
- <id></id>
- <email>laurence.moroney at nospa#m.reuters.com</email>
- <organization></organization>
- </developer>
- <developer>
<name>Radu Preotiuc</name>
<id>radup</id>
<email>radu.preotiuc-pietro at nos#pam.bea.com</email>
<organization></organization>
</developer>
<developer>
- <name>Cliff Schmidt</name>
- <id></id>
- <email>cliffschmidt at n#osp#am!gmail.com</email>
+ <name>Wing Yew Poon</name>
+ <id>wpoon</id>
+ <email>wing-yew.poon at nos#pam.oracle.com</email>
<organization></organization>
</developer>
<developer>
- <name>Dutta Satadip</name>
- <id></id>
- <email>s-dutta at no#spam.sbcglobal.net</email>
+ <name>Jacob Danner</name>
+ <id>jdanner</id>
+ <email>jacob.danner at nos#pam.oracle.com</email>
<organization></organization>
</developer>
- <developer>
- <name>Eric Vasilik</name>
- <id></id>
- <email>eric at nos#pam.vasilik.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>David Waite</name>
- <id></id>
- <email>dwaite at no#spam.apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Scott Ziegler</name>
- <id></id>
- <email>scott.ziegler at n#ospam.bea.com</email>
- <organization></organization>
- </developer>
</developers>
Modified: trunk/xmlbeans/debian/poms/xpath.xml
===================================================================
--- trunk/xmlbeans/debian/poms/xpath.xml 2013-07-09 21:26:43 UTC (rev 17006)
+++ trunk/xmlbeans/debian/poms/xpath.xml 2013-07-10 14:32:37 UTC (rev 17007)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans-xpath</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0</version>
<name>XmlBeansXPath</name>
<description>XmlBeans extended XPath and XQuery support</description>
@@ -57,82 +57,34 @@
<developer>
<name>Cezar Andrei</name>
<id>cezar</id>
- <email>cezar.andrei at no#spam#!bea.com</email>
+ <email>cezar.andrei at no#spam#!gma|l.com</email>
<organization></organization>
</developer>
<developer>
- <name>David Bau</name>
- <id>dbau</id>
- <email>david.bau at no#spam.google.com</email>
+ <name>Radu Preotiuc</name>
+ <id>radup</id>
+ <email>radupr at nos#pam.gm at il.com</email>
<organization></organization>
</developer>
<developer>
- <name>Patrick Calahan</name>
- <id></id>
- <email>pcal at no#spam.bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Yana Kadiyska</name>
- <id></id>
- <email>ykadiysk at no#spam#!bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Ken Kress</name>
- <id></id>
- <email>ken at nos#pam.kress.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Kevin Krouse</name>
- <id></id>
- <email>kkrouse at n#osp#am.apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Laurence Moroney</name>
- <id></id>
- <email>laurence.moroney at nospa#m.reuters.com</email>
- <organization></organization>
- </developer>
- <developer>
<name>Radu Preotiuc</name>
<id>radup</id>
<email>radu.preotiuc-pietro at nos#pam.bea.com</email>
<organization></organization>
</developer>
<developer>
- <name>Cliff Schmidt</name>
- <id></id>
- <email>cliffschmidt at n#osp#am!gmail.com</email>
+ <name>Wing Yew Poon</name>
+ <id>wpoon</id>
+ <email>wing-yew.poon at nos#pam.oracle.com</email>
<organization></organization>
</developer>
<developer>
- <name>Dutta Satadip</name>
- <id></id>
- <email>s-dutta at no#spam.sbcglobal.net</email>
+ <name>Jacob Danner</name>
+ <id>jdanner</id>
+ <email>jacob.danner at nos#pam.oracle.com</email>
<organization></organization>
</developer>
- <developer>
- <name>Eric Vasilik</name>
- <id></id>
- <email>eric at nos#pam.vasilik.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>David Waite</name>
- <id></id>
- <email>dwaite at no#spam.apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Scott Ziegler</name>
- <id></id>
- <email>scott.ziegler at n#ospam.bea.com</email>
- <organization></organization>
- </developer>
</developers>
@@ -140,7 +92,7 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.5.0</version>
+ <version>2.4.0</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
Modified: trunk/xmlbeans/debian/rules
===================================================================
--- trunk/xmlbeans/debian/rules 2013-07-09 21:26:43 UTC (rev 17006)
+++ trunk/xmlbeans/debian/rules 2013-07-10 14:32:37 UTC (rev 17007)
@@ -3,8 +3,8 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-POM_VERSION := 2.4.0
-MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content
+POM_VERSION := 2.6.0
+MAVEN_REPO := http://repo1.maven.org/maven2/
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILD_TARGET := xbean.jar
@@ -29,6 +29,7 @@
clean::
+ mh_clean
-rm -rf debian/tmp
get-orig-source:
More information about the pkg-java-commits
mailing list