[Git][java-team/xmlbeans][master] 7 commits: Converted debian/copyright to the Copyright Format 1.0

Emmanuel Bourg gitlab at salsa.debian.org
Mon Jul 30 23:17:57 BST 2018


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / xmlbeans


Commits:
c46f4a6d by Emmanuel Bourg at 2018-07-25T22:08:49Z
Converted debian/copyright to the Copyright Format 1.0

- - - - -
d861921e by Emmanuel Bourg at 2018-07-25T22:38:18Z
Track and download the new releases from GitHub

- - - - -
86cc6430 by Emmanuel Bourg at 2018-07-26T10:54:04Z
Build with the DH sequencer instead of CDBS

- - - - -
1b05b107 by Emmanuel Bourg at 2018-07-26T10:54:21Z
Standards-Version updated to 4.1.5

- - - - -
84d44238 by Emmanuel Bourg at 2018-07-26T11:15:33Z
Removed build-xml.patch

- - - - -
5ebae3f5 by Emmanuel Bourg at 2018-07-30T22:05:32Z
Removed the StAX dependency in the Maven pom (provided by the JDK)

- - - - -
b5392a77 by Emmanuel Bourg at 2018-07-30T22:17:22Z
Upload to unstable

- - - - -


14 changed files:

- + debian/ant.properties
- debian/changelog
- + debian/clean
- debian/control
- debian/copyright
- debian/libxmlbeans-java.poms
- − debian/orig-tar.exclude
- − debian/orig-tar.sh
- − debian/patches/build-xml.patch
- debian/patches/series
- debian/poms/xmlbeans.xml
- debian/rules
- debian/watch
- + debian/xmlbeans.install


Changes:

=====================================
debian/ant.properties
=====================================
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,7 @@
+saxon_jar=/usr/share/java/Saxon-HE.jar
+saxon_dom_jar=/usr/share/java/Saxon-HE.jar
+jsr173-bundle.exists=true
+jsr173_1.0.jars.exist=true
+saxon9.jar.exists=true
+xcresolver.zip.exists=true
+resolver.jar.exists=true


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
-xmlbeans (2.6.0+dfsg-4) UNRELEASED; urgency=medium
+xmlbeans (2.6.0+dfsg-4) unstable; urgency=medium
 
+  * Team upload
+
+  [ Eugene Zhukov ]
   * Moved the package to Git
 
- -- Eugene Zhukov <eugene at debian.org>  Wed, 02 May 2018 11:43:43 +0300
+  [ Emmanuel Bourg ]
+  * Removed the StAX dependency in the Maven pom (provided by the JDK)
+  * Build with the DH sequencer instead of CDBS
+  * Removed build-xml.patch
+  * Converted debian/copyright to the Copyright Format 1.0
+  * Track and download the new releases from GitHub
+  * Standards-Version updated to 4.1.5
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 31 Jul 2018 00:17:15 +0200
 
 xmlbeans (2.6.0+dfsg-3) unstable; urgency=medium
 


=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+external/lib/junit.jar
+external/lib/oldxbean.jar


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,12 @@ Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
  ant-optional,
- cdbs,
  debhelper (>= 11),
  default-jdk,
  libsaxonhe-java,
  libxmlbeans-java,
  maven-repo-helper
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
 Vcs-Git: https://salsa.debian.org/java-team/xmlbeans.git
 Vcs-Browser: https://salsa.debian.org/java-team/xmlbeans
 Homepage: http://xmlbeans.apache.org


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,71 +1,27 @@
-This package was debianized by Thierry Carrez <thierry.carrez at 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/)
-   under Apache-2.0 License (see below).
-
-   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:
-
-    - 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
-      under Apache-2.0 License (see below)
-
-    - files from Apache Axis products (src/saaj_api/*)
-      Copyright (c) 1999-2003 Apache Software Foundation
-      under Apache-2.0 License (see below)
-
-    - JAM XML Parser (external/lib/jam-0.1.0-src.jar)
-      Copyright 2004 (c) Apache Software Foundation
-      under Apache-2.0 License (see below)
-
-    - Piccolo XML Parser for Java from (external/lib/piccolo_apache_dist_20040711_v2.jar)
-      Copyright 2002 (c) Yuval Oren
-      under Apache-2.0 License (see below)
-
-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.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache XMLBeans
+Source: http://www.apache.org/dist/xmlbeans/source/
+Files-Excluded: external/lib/junit*
+                external/lib/oldxbean.jar
+                samples/vxsdb/external/*
+                test/lib/*.jar
+                test/tools/lib/*.jar
+                test/tools/lib/ant-ext/*.jar
+
+Files: *
+Copyright: 2000-2003, BEA Systems
+           2003-2012, The Apache Software Foundation
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2009, Thierry Carrez <thierry.carrez at ubuntu.com>
+           2010-2011, Damien Raude-Morvan <drazzib at debian.org>
+           2010, Torsten Werner <twerner at debian.org>
+           2013-2016, Emmanuel Bourg <ebourg at apache.org>
+           2016-2018, Eugene Zhukov <eugene at debian.org>
+           2017, Markus Koschany <apo at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'


=====================================
debian/libxmlbeans-java.poms
=====================================
--- a/debian/libxmlbeans-java.poms
+++ b/debian/libxmlbeans-java.poms
@@ -1,3 +1,3 @@
-debian/poms/xmlbeans.xml
-debian/poms/xpath.xml
-debian/poms/qname.xml
+debian/poms/xmlbeans.xml --java-lib --artifact=build/lib/xbean.jar
+debian/poms/xpath.xml    --java-lib --artifact=build/lib/xbean_xpath.jar
+debian/poms/qname.xml    --java-lib --artifact=build/lib/xmlbeans-qname.jar


=====================================
debian/orig-tar.exclude deleted
=====================================
--- a/debian/orig-tar.exclude
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/*


=====================================
debian/orig-tar.sh deleted
=====================================
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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
-


=====================================
debian/patches/build-xml.patch deleted
=====================================
--- a/debian/patches/build-xml.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-Description: build.xml: Fix build classpath
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-03-26
-Forwarded: not-needed
---- 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 ============================================== -->
-@@ -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,7 @@
-             <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/Saxon-HE.jar"/>
-             </classpath>
-         </javac>
-     </target>
-@@ -1061,19 +1060,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 +1092,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 +1117,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 +1140,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>


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-build-xml.patch
 scripts.patch
 saxon_9.7.patch


=====================================
debian/poms/xmlbeans.xml
=====================================
--- a/debian/poms/xmlbeans.xml
+++ b/debian/poms/xmlbeans.xml
@@ -88,12 +88,4 @@
 
     </developers>
 
-    <dependencies>
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-    </dependencies>
-
 </project>


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,40 +1,29 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-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
-DEB_ANT_BUILDFILE    := build.xml
-DEB_JARS	     := ant-nodeps xmlbeans
-ANT_OPTS	     := -Dfile.encoding=iso-8859-1
-
-XMLBEANS_TOOLS       := dumpxsb inst2xsd scomp sdownload sfactor \
-                        svalidate validate xpretty xsd2inst xsdtree xstc
-
-install/libxmlbeans-java::
-	mh_installpoms -plibxmlbeans-java
-	mh_installjar -plibxmlbeans-java -l debian/poms/xmlbeans.xml build/lib/xbean.jar
-	mh_installjar -plibxmlbeans-java -l debian/poms/qname.xml build/lib/xmlbeans-qname.jar
-	mh_installjar -plibxmlbeans-java -l debian/poms/xpath.xml build/lib/xbean_xpath.jar
-
-install/xmlbeans::
-	for TOOL in $(XMLBEANS_TOOLS); do \
-		dh_install -pxmlbeans bin/$$TOOL /usr/bin/; \
-	done
+export CLASSPATH=/usr/share/java/xmlbeans.jar
+
+%:
+	dh $@ --with maven-repo-helper
+
+override_dh_auto_build:
+	mkdir -p external/lib/
+	ln -s /usr/share/java/xmlbeans.jar external/lib/oldxbean.jar
+	ln -s /usr/share/java/junit.jar    external/lib/junit.jar
+
+	mkdir -p build/lib/
+	ln -s /usr/share/java/geronimo-stax-1.0-spec.jar build/lib/jsr173_1.0_api.jar
+
+	ANT_OPTS=-Dfile.encoding=iso-8859-1 dh_auto_build -- xbean.jar
+
+override_dh_install:
+	dh_install
+
 	# Rename to fix filename conflict: See #578032
 	mv debian/xmlbeans/usr/bin/validate debian/xmlbeans/usr/bin/xsdvalidate
 
-clean::
-	mh_clean
-	-rm -rf debian/tmp
+POM_VERSION := 2.6.0
 
 get-orig-pom:
-	wget -O debian/poms/xmlbeans.xml $(MAVEN_REPO)/org/apache/xmlbeans/xmlbeans/$(POM_VERSION)/xmlbeans-$(POM_VERSION).pom
-	wget -O debian/poms/qname.xml $(MAVEN_REPO)/org/apache/xmlbeans/xmlbeans-qname/$(POM_VERSION)/xmlbeans-qname-$(POM_VERSION).pom
-	wget -O debian/poms/xpath.xml $(MAVEN_REPO)/org/apache/xmlbeans/xmlbeans-xpath/$(POM_VERSION)/xmlbeans-xpath-$(POM_VERSION).pom
-	perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(DEB_UPSTREAM_VERSION)/' debian/poms/*.xml
-
+	wget -O debian/poms/xmlbeans.xml https://repo1.maven.org/maven2/org/apache/xmlbeans/xmlbeans/$(POM_VERSION)/xmlbeans-$(POM_VERSION).pom
+	wget -O debian/poms/qname.xml https://repo1.maven.org/maven2/org/apache/xmlbeans/xmlbeans-qname/$(POM_VERSION)/xmlbeans-qname-$(POM_VERSION).pom
+	wget -O debian/poms/xpath.xml https://repo1.maven.org/maven2/org/apache/xmlbeans/xmlbeans-xpath/$(POM_VERSION)/xmlbeans-xpath-$(POM_VERSION).pom


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="dversionmangle=s/\+dfsg//" \
-http://svn.apache.org/viewvc/xmlbeans/tags/ (\d.*)/ debian debian/orig-tar.sh
+opts="dversionmangle=s/\+dfsg//,repack,compression=xz" \
+https://github.com/apache/xmlbeans/tags .*/([\d\.]+).tar.gz


=====================================
debian/xmlbeans.install
=====================================
--- /dev/null
+++ b/debian/xmlbeans.install
@@ -0,0 +1,11 @@
+bin/dumpxsb       /usr/bin/
+bin/inst2xsd      /usr/bin/
+bin/scomp         /usr/bin/
+bin/sdownload     /usr/bin/
+bin/sfactor       /usr/bin/
+bin/svalidate     /usr/bin/
+bin/validate      /usr/bin/
+bin/xpretty       /usr/bin/
+bin/xsd2inst      /usr/bin/
+bin/xsdtree       /usr/bin/
+bin/xstc          /usr/bin/



View it on GitLab: https://salsa.debian.org/java-team/xmlbeans/compare/e402797ea3d5c4924bde891aee8290000dd3025f...b5392a77bc2fde18a56393f5f3e53e668346d000

-- 
View it on GitLab: https://salsa.debian.org/java-team/xmlbeans/compare/e402797ea3d5c4924bde891aee8290000dd3025f...b5392a77bc2fde18a56393f5f3e53e668346d000
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180730/78be1884/attachment.html>


More information about the pkg-java-commits mailing list