[pkg-java] r11465 - in trunk/xmlbeans/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Jan 31 17:45:56 UTC 2010
Author: drazzib
Date: 2010-01-31 17:45:55 +0000 (Sun, 31 Jan 2010)
New Revision: 11465
Added:
trunk/xmlbeans/debian/README.source
trunk/xmlbeans/debian/orig-tar.exclude
trunk/xmlbeans/debian/orig-tar.sh
trunk/xmlbeans/debian/patches/series
trunk/xmlbeans/debian/watch
Modified:
trunk/xmlbeans/debian/changelog
trunk/xmlbeans/debian/compat
trunk/xmlbeans/debian/control
trunk/xmlbeans/debian/copyright
trunk/xmlbeans/debian/patches/build-xml.patch
trunk/xmlbeans/debian/rules
Log:
* Import package in Debian based on Thierry Carrez <thierry.carrez at ubuntu.com>
work. Thanks Thierry!
* New upstream release.
* Bump Debhelper compat level to 7
* Update to Standards-Version 3.8.4:
- Move to java section
- Add Vcs-* fields to pkg-java svn repository
* Add debian/watch to track upstream releases
* Move ant and default-jdk to Build-Depends (needed for clean target)
* Use Quilt as patch system:
- Update debian/rules
- Add quilt to Build-Depends
- Update all patches
- Add debian/README.source
* Update and review of debian/copyright
Added: trunk/xmlbeans/debian/README.source
===================================================================
--- trunk/xmlbeans/debian/README.source (rev 0)
+++ trunk/xmlbeans/debian/README.source 2010-01-31 17:45:55 UTC (rev 11465)
@@ -0,0 +1,9 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
Modified: trunk/xmlbeans/debian/changelog
===================================================================
--- trunk/xmlbeans/debian/changelog 2010-01-31 16:24:30 UTC (rev 11464)
+++ trunk/xmlbeans/debian/changelog 2010-01-31 17:45:55 UTC (rev 11465)
@@ -1,3 +1,23 @@
+xmlbeans (2.5.0-1) jaunty; urgency=low
+
+ * Import package in Debian based on Thierry Carrez <thierry.carrez at ubuntu.com>
+ work. Thanks Thierry!
+ * New upstream release.
+ * Bump Debhelper compat level to 7
+ * Update to Standards-Version 3.8.4:
+ - Move to java section
+ - Add Vcs-* fields to pkg-java svn repository
+ * Add debian/watch to track upstream releases
+ * Move ant and default-jdk to Build-Depends (needed for clean target)
+ * Use Quilt as patch system:
+ - Update debian/rules
+ - Add quilt to Build-Depends
+ - Update all patches
+ - Add debian/README.source
+ * Update and review of debian/copyright
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 31 Jan 2010 18:36:34 +0100
+
xmlbeans (2.4.0-0ubuntu2) jaunty; urgency=low
* Do not use bundled oldxbean.jar to build, build-dep on itself instead.
Modified: trunk/xmlbeans/debian/compat
===================================================================
--- trunk/xmlbeans/debian/compat 2010-01-31 16:24:30 UTC (rev 11464)
+++ trunk/xmlbeans/debian/compat 2010-01-31 17:45:55 UTC (rev 11465)
@@ -1 +1 @@
-5
+7
Modified: trunk/xmlbeans/debian/control
===================================================================
--- trunk/xmlbeans/debian/control 2010-01-31 16:24:30 UTC (rev 11464)
+++ trunk/xmlbeans/debian/control 2010-01-31 17:45:55 UTC (rev 11465)
@@ -1,14 +1,13 @@
Source: xmlbeans
-Section: libs
+Section: java
Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu at 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
+Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk, quilt
+Build-Depends-Indep: ant-optional,
+ libsaxonb-java
Homepage: http://xmlbeans.apache.org/
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
Package: libxmlbeans-java
Architecture: all
@@ -16,6 +15,7 @@
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
Modified: trunk/xmlbeans/debian/copyright
===================================================================
--- trunk/xmlbeans/debian/copyright 2010-01-31 16:24:30 UTC (rev 11464)
+++ trunk/xmlbeans/debian/copyright 2010-01-31 17:45:55 UTC (rev 11465)
@@ -14,24 +14,20 @@
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
+ - files from the Apache Xerces-J
+ (src/common/org/apache/xmlbeans/impl/common/* and
+ src/typeimpl/org/apache/xmlbeans/impl/regex/*)
+ 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)
+ - files from Apache Axis products (src/saaj_api/*)
+ Copyright (c) 1999-2003 Apache Software Foundation
- - resolver.jar from Apache Xml Commons project,
- Copyright (c) 2001-2003 Apache Software Foundation
+ - JAM XML Parser (external/lib/jam-0.1.0-src.jar)
+ Copyright 2004 (c) 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
+ - Piccolo XML Parser for Java from (external/lib/piccolo_apache_dist_20040711_v2.jar)
+ Copyright 2002 (c) Yuval Oren
- - 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:
Added: trunk/xmlbeans/debian/orig-tar.exclude
===================================================================
--- trunk/xmlbeans/debian/orig-tar.exclude (rev 0)
+++ trunk/xmlbeans/debian/orig-tar.exclude 2010-01-31 17:45:55 UTC (rev 11465)
@@ -0,0 +1,13 @@
+# XMLBeans has customization on JAM codebase
+#external/lib/jam*
+external/lib/jsr*
+external/lib/junit*
+external/lib/META-INF
+external/lib/oldxbean.jar
+external/lib/saxon*
+external/lib/xcresolver.zip
+# XMLBeans has customization on Piccolo codebase
+external/lib/piccolo_apache_dist_20040629.jar
+external/lib/piccolo_apache_dist_20040629_v2.jar
+external/lib/piccolo_apache_dist_20040711.jar
+samples/vxsdb/external/*
Added: trunk/xmlbeans/debian/orig-tar.sh
===================================================================
--- trunk/xmlbeans/debian/orig-tar.sh (rev 0)
+++ trunk/xmlbeans/debian/orig-tar.sh 2010-01-31 17:45:55 UTC (rev 11465)
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+# $2 = version
+# $3 = file
+DIR=xmlbeans-$2.orig
+TAR=xmlbeans_$2.orig.tar.gz
+
+# clean up the upstream tarball
+tar zxf $3
+mv xmlbeans-* $DIR
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+
Modified: trunk/xmlbeans/debian/patches/build-xml.patch
===================================================================
--- trunk/xmlbeans/debian/patches/build-xml.patch 2010-01-31 16:24:30 UTC (rev 11464)
+++ trunk/xmlbeans/debian/patches/build-xml.patch 2010-01-31 17:45:55 UTC (rev 11465)
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/build.xml
++++ b/build.xml
+@@ -237,7 +237,7 @@
<!-- oldxbean.jar target =========================================== -->
<target name="oldxbean.jar">
@@ -9,7 +9,7 @@
</target>
<!-- bootstrap target ============================================== -->
-@@ -448,7 +448,7 @@
+@@ -483,7 +483,7 @@
typeimpl.classes, xmlcomp.classes,
store.classes, saaj_api.classes,
marshal.classes, xpath.classes, oldxbean.jar, xsdschema.classes,
@@ -18,7 +18,7 @@
piccolo.classes, tools.classes, jamsupport.classes">
<jar jarfile="build/lib/xbean.jar" index="true">
<fileset dir="build/classes/xmlpublic"
-@@ -504,12 +504,12 @@
+@@ -539,12 +539,12 @@
<!-- xmlpublic target ============================================== -->
@@ -33,7 +33,7 @@
</classpath>
</javac>
-@@ -546,7 +546,7 @@
+@@ -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>
@@ -42,7 +42,7 @@
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/common"/>
-@@ -557,11 +557,11 @@
+@@ -592,11 +592,11 @@
<!-- common target ============================================= -->
@@ -56,7 +56,7 @@
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
</classpath>
-@@ -599,7 +599,7 @@
+@@ -634,7 +634,7 @@
<target name="typeimpl.classes" depends="dirs, store.classes,
repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
@@ -65,7 +65,7 @@
<mkdir dir="build/classes/typeimpl"/>
<javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
<classpath>
-@@ -615,7 +615,7 @@
+@@ -650,7 +650,7 @@
<pathelement location="build/classes/xmlschema"/>
<pathelement location="build/classes/toolschema"/>
<pathelement location="build/classes/jam"/>
@@ -74,7 +74,7 @@
</classpath>
<src path="src/typeimpl"/>
-@@ -641,7 +641,7 @@
+@@ -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>
@@ -83,7 +83,7 @@
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/common"/>
-@@ -657,11 +657,11 @@
+@@ -692,11 +692,11 @@
<!-- marshal target =============================================== -->
@@ -97,7 +97,7 @@
<pathelement location="build/classes/configschema"/>
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
-@@ -703,7 +703,7 @@
+@@ -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"/>
@@ -106,7 +106,7 @@
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/common"/>
-@@ -722,7 +722,7 @@
+@@ -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"/>
@@ -115,7 +115,7 @@
<pathelement location="build/classes/xmlinputstream"/>
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/common"/>
-@@ -744,13 +744,13 @@
+@@ -779,13 +779,13 @@
<path id="bootstrap.run.path">
<pathelement location="build/private/lib/oldxbean.jar"/>
@@ -131,7 +131,7 @@
</path>
<property name="bootstrap.compile.path" refid="bootstrap.compile.path"/>
-@@ -794,7 +794,7 @@
+@@ -829,7 +829,7 @@
</condition>
</target>
@@ -140,7 +140,7 @@
<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 @@
+@@ -972,7 +972,7 @@
<!-- xpath target ============================================= -->
@@ -149,7 +149,7 @@
<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 @@
+@@ -991,8 +991,8 @@
<classpath id="xpath.compile.path">
<pathelement location="build/classes/xmlpublic"/>
<pathelement location="build/classes/store"/>
@@ -160,7 +160,7 @@
</classpath>
</javac>
</target>
-@@ -1016,19 +1016,19 @@
+@@ -1053,19 +1053,19 @@
<path id="test.compile.path">
<pathelement location="build/classes/marshal"/>
<pathelement location="build/classes/common"/>
@@ -184,7 +184,7 @@
<mkdir dir="build/private/classes/drt"/>
<javac
destdir="build/private/classes/drt"
-@@ -1048,7 +1048,7 @@
+@@ -1085,7 +1085,7 @@
<path id="scomp.run.path">
<pathelement location="build/lib/xbean.jar"/>
@@ -193,7 +193,7 @@
</path>
<target name="stsschema.check">
-@@ -1073,7 +1073,7 @@
+@@ -1110,7 +1110,7 @@
</uptodate>
</target>
@@ -202,7 +202,7 @@
<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 @@
+@@ -1133,7 +1133,7 @@
debug="on">
<src path="build/private/jam/src_repackage"/>
<classpath>
Added: trunk/xmlbeans/debian/patches/series
===================================================================
--- trunk/xmlbeans/debian/patches/series (rev 0)
+++ trunk/xmlbeans/debian/patches/series 2010-01-31 17:45:55 UTC (rev 11465)
@@ -0,0 +1 @@
+build-xml.patch
Modified: trunk/xmlbeans/debian/rules
===================================================================
--- trunk/xmlbeans/debian/rules 2010-01-31 16:24:30 UTC (rev 11464)
+++ trunk/xmlbeans/debian/rules 2010-01-31 17:45:55 UTC (rev 11465)
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
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
@@ -22,3 +22,6 @@
$(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
+
+get-orig-source:
+ uscan --force-download --rename
Added: trunk/xmlbeans/debian/watch
===================================================================
--- trunk/xmlbeans/debian/watch (rev 0)
+++ trunk/xmlbeans/debian/watch 2010-01-31 17:45:55 UTC (rev 11465)
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/xmlbeans/source/xmlbeans-([\d.]+)-src.tgz debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list