--- xmlbeans-2.4.0.orig/debian/compat
+++ xmlbeans-2.4.0/debian/compat
@@ -0,0 +1 @@
+5
--- xmlbeans-2.4.0.orig/debian/rules
+++ xmlbeans-2.4.0/debian/rules
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+JAVA_HOME 	     := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := xbean.jar
+DEB_ANT_BUILDFILE    := build.xml
+DEB_JARS	     := ant-nodeps
+
+install/libxmlbeans-java::
+	install -m 644 -D build/lib/xbean.jar \
+	  $(DEB_DESTDIR)/usr/share/java/xmlbeans-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/xmlbeans-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/xmlbeans.jar
+	install -m 644 -D build/lib/xbean_xpath.jar \
+	  $(DEB_DESTDIR)/usr/share/java/xmlbeans_xpath-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/xmlbeans_xpath-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/xmlbeans_xpath.jar
+	install -m 644 -D build/lib/xmlbeans-qname.jar \
+	  $(DEB_DESTDIR)/usr/share/java/xmlbeans-qname-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/xmlbeans-qname-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/xmlbeans-qname.jar
+	install -m 755 -D bin/scomp \
+	  $(DEB_DESTDIR)/usr/bin/scomp
--- xmlbeans-2.4.0.orig/debian/control
+++ xmlbeans-2.4.0/debian/control
@@ -0,0 +1,27 @@
+Source: xmlbeans
+Section: libs
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends-Indep: ant, ant-optional, default-jdk,
+ libxmlbeans-java,
+ libsaxonb-java,
+ libgeronimo-stax-1.0-spec-java
+Homepage: http://xmlbeans.apache.org/
+Standards-Version: 3.8.0
+
+Package: libxmlbeans-java
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless,
+ libxml-commons-resolver1.1-java
+Description: Java library for accessing XML by binding it to Java types
+ XMLBeans is a technology for accessing XML by binding it to Java types.
+ XMLBeans provides several ways to get at the XML, including:
+  * Through XML schema that has been compiled to generate Java types that
+    represent schema types. In this way, you can access instances of the
+    schema through JavaBeans-style accessors after the fashion of "getFoo"
+    and "setFoo". The XMLBeans API also allows you to reflect into the XML
+    schema itself through an XML Schema Object model.
+  * A cursor model through which you can traverse the full XML infoset.
+  * Support for XML DOM.
+
--- xmlbeans-2.4.0.orig/debian/copyright
+++ xmlbeans-2.4.0/debian/copyright
@@ -0,0 +1,70 @@
+This package was debianized by Thierry Carrez <thierry.carrez@ubuntu.com> on
+Tue, 17 Feb 2009 11:03:09 +0000
+
+Source tarball was downloaded from http://www.apache.org/dist/xmlbeans/source/
+
+Copyright:
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of this software were originally based on the following:
+     - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+
+   Aside from contributions to the Apache XMLBeans project, this
+   software also includes:
+
+    - one or more source files from the Apache Xerces-J and Apache Axis
+      products, Copyright (c) 1999-2003 Apache Software Foundation
+
+    - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
+      Consortium (Massachusetts Institute of Technology, European Research
+      Consortium for Informatics and Mathematics, Keio University)
+
+    - resolver.jar from Apache Xml Commons project,
+      Copyright (c) 2001-2003 Apache Software Foundation
+
+    - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
+      Copyright 2002 Yuval Oren under the terms of the Apache Software License 2
+.0
+
+    - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpull
+parser/,
+      Copyright 2005 BEA under the terms of the Apache Software License 2.0
+
+Authors:
+
+    The Apache Software Foundations XMLBeans Committers, including:
+    Cezar Andrei
+    David Bau
+    Patrick Calahan
+    Jacob Danner
+    Yana Kadiyska
+    Ken Kress
+    Kevin Krouse
+    Laurence Moroney
+    Radu Preotiuc
+    Cliff Schmidt
+    Dutta Satadip
+    Eric Vasilik
+    David Waite
+    Scott Ziegler
+
+License:
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+         http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+On Debian GNU/Linux and Ubuntu systems, the complete text of the Apache 2.0
+License can be found in the /usr/share/common-licenses/Apache-2.0 file.
+
+The same license and copyright applies to the Debian packaging.
--- xmlbeans-2.4.0.orig/debian/changelog
+++ xmlbeans-2.4.0/debian/changelog
@@ -0,0 +1,17 @@
+xmlbeans (2.4.0-0ubuntu2~ppa1) jaunty; urgency=low
+
+  * Installs the scomp command line executable
+
+ -- E.L. Willighagen <egonw@users.sourceforge.net>  Thu, 13 Mar 2009 19:42:33 +0100
+
+xmlbeans (2.4.0-0ubuntu2) jaunty; urgency=low
+
+  * Do not use bundled oldxbean.jar to build, build-dep on itself instead.
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Thu, 19 Feb 2009 13:06:11 +0000
+
+xmlbeans (2.4.0-0ubuntu1) jaunty; urgency=low
+
+  * Initial release
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Tue, 17 Feb 2009 19:59:55 +0000
--- xmlbeans-2.4.0.orig/debian/patches/scomp.patch
+++ xmlbeans-2.4.0/debian/patches/scomp.patch
@@ -0,0 +1,20 @@
+--- bin/scomp.orig	2007-05-15 22:41:35.000000000 +0200
++++ bin/scomp	2009-03-13 20:45:25.432795120 +0100
+@@ -18,14 +18,8 @@
+ #Schema compiler
+ #Builds XBean types from xsd files.
+ 
+-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi
++XMLBEANS_LIB=/usr/share/java
+ 
+-cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$JAVA_HOME/lib/tools.jar:$XMLBEANS_LIB/resolver.jar
++cp=$XMLBEANS_LIB/xmlbeans.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/geronimo-stax-1.0-spec.jar:$JAVA_HOME/lib/tools.jar:$XMLBEANS_LIB/xmlbeans_path.jar
+ 
+-case "`uname`" in
+-    CYGWIN*)
+-        cp=`cygpath -w -p $cp`
+-        ;;
+-esac
+-
+-java -Xmx256m -classpath "$cp" org.apache.xmlbeans.impl.tool.SchemaCompiler "$@"
++exec /usr/bin/java -Xmx256m -classpath "$cp" org.apache.xmlbeans.impl.tool.SchemaCompiler "$@"
--- xmlbeans-2.4.0.orig/debian/patches/build-xml.patch
+++ xmlbeans-2.4.0/debian/patches/build-xml.patch
@@ -0,0 +1,213 @@
+--- build.xml.orig	2009-02-17 13:11:06.000000000 +0000
++++ build.xml	2009-02-17 13:13:35.000000000 +0000
+@@ -236,7 +236,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 ============================================== -->
+@@ -448,7 +448,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"
+@@ -504,12 +504,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>
+ 
+@@ -546,7 +546,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"/>
+@@ -557,11 +557,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>
+@@ -599,7 +599,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>
+@@ -615,7 +615,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"/>
+@@ -641,7 +641,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"/>
+@@ -657,11 +657,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"/>
+@@ -703,7 +703,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"/>
+@@ -722,7 +722,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"/>
+@@ -744,13 +744,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"/>
+@@ -794,7 +794,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">
+@@ -935,7 +935,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"/>
+@@ -954,8 +954,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>
+@@ -1016,19 +1016,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"
+@@ -1048,7 +1048,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">
+@@ -1073,7 +1073,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"/>
+@@ -1096,7 +1096,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>
--- xmlbeans-2.4.0.orig/debian.ubuntu/compat
+++ xmlbeans-2.4.0/debian.ubuntu/compat
@@ -0,0 +1 @@
+5
--- xmlbeans-2.4.0.orig/debian.ubuntu/rules
+++ xmlbeans-2.4.0/debian.ubuntu/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+JAVA_HOME 	     := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := xbean.jar
+DEB_ANT_BUILDFILE    := build.xml
+DEB_JARS	     := ant-nodeps
+
+install/libxmlbeans-java::
+	install -m 644 -D build/lib/xbean.jar \
+	  $(DEB_DESTDIR)/usr/share/java/xmlbeans-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/xmlbeans-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/xmlbeans.jar
+	install -m 644 -D build/lib/xbean_xpath.jar \
+	  $(DEB_DESTDIR)/usr/share/java/xmlbeans_xpath-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/xmlbeans_xpath-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/xmlbeans_xpath.jar
+	install -m 644 -D build/lib/xmlbeans-qname.jar \
+	  $(DEB_DESTDIR)/usr/share/java/xmlbeans-qname-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/xmlbeans-qname-$(DEB_UPSTREAM_VERSION).jar \
+	  /usr/share/java/xmlbeans-qname.jar
--- xmlbeans-2.4.0.orig/debian.ubuntu/control
+++ xmlbeans-2.4.0/debian.ubuntu/control
@@ -0,0 +1,27 @@
+Source: xmlbeans
+Section: libs
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends-Indep: ant, ant-optional, default-jdk,
+ libxmlbeans-java,
+ libsaxonb-java,
+ libgeronimo-stax-1.0-spec-java
+Homepage: http://xmlbeans.apache.org/
+Standards-Version: 3.8.0
+
+Package: libxmlbeans-java
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless,
+ libxml-commons-resolver1.1-java
+Description: Java library for accessing XML by binding it to Java types
+ XMLBeans is a technology for accessing XML by binding it to Java types.
+ XMLBeans provides several ways to get at the XML, including:
+  * Through XML schema that has been compiled to generate Java types that
+    represent schema types. In this way, you can access instances of the
+    schema through JavaBeans-style accessors after the fashion of "getFoo"
+    and "setFoo". The XMLBeans API also allows you to reflect into the XML
+    schema itself through an XML Schema Object model.
+  * A cursor model through which you can traverse the full XML infoset.
+  * Support for XML DOM.
+
--- xmlbeans-2.4.0.orig/debian.ubuntu/copyright
+++ xmlbeans-2.4.0/debian.ubuntu/copyright
@@ -0,0 +1,70 @@
+This package was debianized by Thierry Carrez <thierry.carrez@ubuntu.com> on
+Tue, 17 Feb 2009 11:03:09 +0000
+
+Source tarball was downloaded from http://www.apache.org/dist/xmlbeans/source/
+
+Copyright:
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of this software were originally based on the following:
+     - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+
+   Aside from contributions to the Apache XMLBeans project, this
+   software also includes:
+
+    - one or more source files from the Apache Xerces-J and Apache Axis
+      products, Copyright (c) 1999-2003 Apache Software Foundation
+
+    - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
+      Consortium (Massachusetts Institute of Technology, European Research
+      Consortium for Informatics and Mathematics, Keio University)
+
+    - resolver.jar from Apache Xml Commons project,
+      Copyright (c) 2001-2003 Apache Software Foundation
+
+    - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
+      Copyright 2002 Yuval Oren under the terms of the Apache Software License 2
+.0
+
+    - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpull
+parser/,
+      Copyright 2005 BEA under the terms of the Apache Software License 2.0
+
+Authors:
+
+    The Apache Software Foundations XMLBeans Committers, including:
+    Cezar Andrei
+    David Bau
+    Patrick Calahan
+    Jacob Danner
+    Yana Kadiyska
+    Ken Kress
+    Kevin Krouse
+    Laurence Moroney
+    Radu Preotiuc
+    Cliff Schmidt
+    Dutta Satadip
+    Eric Vasilik
+    David Waite
+    Scott Ziegler
+
+License:
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+         http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+On Debian GNU/Linux and Ubuntu systems, the complete text of the Apache 2.0
+License can be found in the /usr/share/common-licenses/Apache-2.0 file.
+
+The same license and copyright applies to the Debian packaging.
--- xmlbeans-2.4.0.orig/debian.ubuntu/changelog
+++ xmlbeans-2.4.0/debian.ubuntu/changelog
@@ -0,0 +1,11 @@
+xmlbeans (2.4.0-0ubuntu2) jaunty; urgency=low
+
+  * Do not use bundled oldxbean.jar to build, build-dep on itself instead.
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Thu, 19 Feb 2009 13:06:11 +0000
+
+xmlbeans (2.4.0-0ubuntu1) jaunty; urgency=low
+
+  * Initial release
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Tue, 17 Feb 2009 19:59:55 +0000
--- xmlbeans-2.4.0.orig/debian.ubuntu/patches/build-xml.patch
+++ xmlbeans-2.4.0/debian.ubuntu/patches/build-xml.patch
@@ -0,0 +1,213 @@
+--- build.xml.orig	2009-02-17 13:11:06.000000000 +0000
++++ build.xml	2009-02-17 13:13:35.000000000 +0000
+@@ -236,7 +236,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 ============================================== -->
+@@ -448,7 +448,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"
+@@ -504,12 +504,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>
+ 
+@@ -546,7 +546,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"/>
+@@ -557,11 +557,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>
+@@ -599,7 +599,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>
+@@ -615,7 +615,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"/>
+@@ -641,7 +641,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"/>
+@@ -657,11 +657,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"/>
+@@ -703,7 +703,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"/>
+@@ -722,7 +722,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"/>
+@@ -744,13 +744,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"/>
+@@ -794,7 +794,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">
+@@ -935,7 +935,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"/>
+@@ -954,8 +954,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>
+@@ -1016,19 +1016,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"
+@@ -1048,7 +1048,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">
+@@ -1073,7 +1073,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"/>
+@@ -1096,7 +1096,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>