summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Bourg <ebourg@apache.org>2018-03-16 13:28:02 +0100
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2018-03-16 16:31:38 +0000
commit9e4dca745d907c80f6a11aabe1b36cfd70b63f45 (patch)
treef3b2434982deddb867f0588ee77f4a1e36f98231
parent2151d64e4319fa8eed95ab7ca6f4b0d9a0e05971 (diff)
1.1.4c-3 (patches unapplied)import/1.1.4c-3ubuntu/oracular-develubuntu/oracularubuntu/noble-develubuntu/nobleubuntu/mantic-develubuntu/manticubuntu/lunar-develubuntu/lunarubuntu/kinetic-develubuntu/kineticubuntu/jammy-develubuntu/jammyubuntu/impish-develubuntu/impishubuntu/hirsute-develubuntu/hirsuteubuntu/groovy-develubuntu/groovyubuntu/focal-develubuntu/focalubuntu/eoan-develubuntu/eoanubuntu/disco-develubuntu/discoubuntu/cosmic-develubuntu/cosmicubuntu/bionic-proposedubuntu/bionic-develubuntu/bionicdebian/busterdebian/bullseyedebian/bookworm
Imported using git-ubuntu import.
Notes
Notes: * Team upload. * Fixed the build failure with Java 9 (Closes: #893084) * Removed the javadoc from the binary package * Build with the DH sequencer instead of CDBS * Moved the package to Git * Standards-Version updated to 4.1.3 * Switch to debhelper level 11 * Updated debian/copyright to the Copyright Format 1.0
Diffstat
-rw-r--r--debian/README.source17
-rw-r--r--debian/changelog19
-rw-r--r--debian/compat2
-rw-r--r--debian/control24
-rw-r--r--debian/copyright106
-rw-r--r--debian/libxpp3-java.dirs1
-rw-r--r--debian/libxpp3-java.doc-base10
-rw-r--r--debian/libxpp3-java.docs2
-rw-r--r--debian/libxpp3-java.poms7
-rw-r--r--debian/patches/build.patch132
-rwxr-xr-xdebian/rules30
11 files changed, 124 insertions, 226 deletions
diff --git a/debian/README.source b/debian/README.source
index 328fb4e..ffb1b10 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,20 +3,3 @@ Upstream tarball changes
From the original upstream distribution the prebuilt
jar files were removed with rm *.jar in the basedir.
-
-
-Patch management
-================
-
-This package uses the simple patch system of CDBS to manage
-modifications to the upstream source code.
-
-To apply all patches to the source, invoke
- debian/rules patch
-
-To unapply all patches, invoke
- debian/rules unpatch
-
-All patches are diff files located in debian/patches and should end
-with ".patch". To add a patch, just drop the diff in this
-directory.
diff --git a/debian/changelog b/debian/changelog
index 2ad65ef..2a27301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libxpp3-java (1.1.4c-3) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the build failure with Java 9 (Closes: #893084)
+ * Removed the javadoc from the binary package
+ * Build with the DH sequencer instead of CDBS
+ * Moved the package to Git
+ * Standards-Version updated to 4.1.3
+ * Switch to debhelper level 11
+ * Updated debian/copyright to the Copyright Format 1.0
+
+ -- Emmanuel Bourg <ebourg@apache.org> Fri, 16 Mar 2018 13:28:02 +0100
+
libxpp3-java (1.1.4c-2) unstable; urgency=low
* Switch to source format 3.0.
@@ -10,8 +23,8 @@ libxpp3-java (1.1.4c-1) unstable; urgency=low
[ Ludovic Claude ]
* New upstream version
- * Add myself to Uploaders
- * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Add myself to Uploaders
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
* Remove Depends on Java runtimes as it is a library
* Change section to java
* Bump up Standards-Version to 3.8.2
@@ -74,7 +87,7 @@ libxpp3-java (1.1.3.4.M-1) experimental; urgency=low
* Included additional xpath library
* Enabled junit tests
* Included xmlpull api documentation
- * Reworked description to show differences to the xpp2 version
+ * Reworked description to show differences to the xpp2 version
-- Wolfgang Baer <WBaer@gmx.de> Sat, 23 Apr 2005 15:23:09 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+11
diff --git a/debian/control b/debian/control
index 92c012c..9cb257c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,21 @@ Source: libxpp3-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Marcus Better <marcus@better.se>,
+Uploaders:
+ Marcus Better <marcus@better.se>,
Ludovic Claude <ludovic.claude@laposte.net>,
Torsten Werner <twerner@debian.org>
-Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, default-jdk
-Build-Depends-Indep: junit, maven-repo-helper
-Standards-Version: 3.9.1
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 11),
+ default-jdk,
+ junit,
+ maven-repo-helper
+Standards-Version: 4.1.3
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxpp3-java.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libxpp3-java.git
Homepage: http://www.extreme.indiana.edu/xgws/xsoap/xpp
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxpp3-java
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/libxpp3-java/
Package: libxpp3-java
Architecture: all
@@ -18,7 +24,7 @@ Depends: ${misc:Depends}
Description: XML pull parser library for java
Xml Pull Parser (in short XPP) is a streaming pull XML parser for java.
This version XPP3 is a successor of XPP2 (see package libxpp2-java) that
- implements XmlPull API (see http://www.xmlpull.org).
+ implements XmlPull API (see http://www.xmlpull.org).
.
- However XPP3 currently supports only parsing and does not support
- incremental node tree from XPP2.
+ However XPP3 currently supports only parsing and does not support
+ incremental node tree from XPP2.
diff --git a/debian/copyright b/debian/copyright
index 3870571..1f4ad3c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,11 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: XML Pull Parser 3
-Upstream-Maintainer:
-Upstream-Source: http://www.extreme.indiana.edu/xgws/xsoap/xpp
+Source: http://www.extreme.indiana.edu/xgws/xsoap/xpp
Files: *
-Copyright: Copyright 2002-2004 Extreme! Lab, Indiana University
-Copyright: Copyright 2000-2004 Jason Hunter
-License: other-BSD
+Copyright: 2002-2004, Extreme! Lab, Indiana University
+ 2000-2004, Jason Hunter
+License: Apache-1.1-extreme
Indiana University Extreme! Lab Software License
.
Version 1.1.1
@@ -56,19 +54,61 @@ License: other-BSD
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: src/java/builder/javax/xml/namespace/QName.java
-Copyright: Copyright 2001-2003 The Apache Software Foundation
+Copyright: 2001-2003, The Apache Software Foundation
License: Apache-1.1
+License: Apache-1.1
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ .
+ 3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by the
+ Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+ .
+ 4. The names "Axis" and "Apache Software Foundation" must
+ not be used to endorse or promote products derived from this
+ software without prior written permission. For written
+ permission, please contact apache@apache.org.
+ .
+ 5. Products derived from this software may not be called "Apache",
+ nor may "Apache" appear in their name, without prior written
+ permission of the Apache Software Foundation.
+ .
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
Files: src/java/tests/*
-Copyright: Copyright 2002 Aleksander Slominski
+Copyright: 2002, Aleksander Slominski
License: LGPL-2.1+
The full text of this license can be found in
`/usr/share/common-licenses/LPGL-2.1'.
Files: src/java/xpath/org/xmlpull/v1/builder/xpath/jaxen/*
-Copyright: Copyright 2000-2002 bob mcwhirter <bob@werken.com>
-Copyright: Copyright 2000-2002 James Strachan <jstrachan@apache.org>
-License: BSD-jaxen
+Copyright: 2000-2002, bob mcwhirter <bob@werken.com>
+ 2000-2002, James Strachan <jstrachan@apache.org>
+License: Apache-1.1-jaxen
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -77,8 +117,8 @@ License: BSD-jaxen
notice, this list of conditions, and the following disclaimer.
.
2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions, and the disclaimer that follows
- these conditions in the documentation and/or other materials
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
provided with the distribution.
.
3. The name "Jaxen" must not be used to endorse or promote products
@@ -89,12 +129,12 @@ License: BSD-jaxen
may "Jaxen" appear in their name, without prior written permission
from the Jaxen Project Management (pm@jaxen.org).
.
- In addition, we request (but do not require) that you include in the
- end-user documentation provided with the redistribution and/or in the
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
software itself an acknowledgement equivalent to the following:
"This product includes software developed by the
Jaxen Project (http://www.jaxen.org/)."
- Alternatively, the acknowledgment may be graphical using the logos
+ Alternatively, the acknowledgment may be graphical using the logos
available at http://www.jaxen.org/
.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -110,15 +150,15 @@ License: BSD-jaxen
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
.
- This software consists of voluntary contributions made by many
- individuals on behalf of the Jaxen Project and was originally
- created by bob mcwhirter <bob@werken.com> and
- James Strachan <jstrachan@apache.org>. For more information on the
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the Jaxen Project and was originally
+ created by bob mcwhirter <bob@werken.com> and
+ James Strachan <jstrachan@apache.org>. For more information on the
Jaxen Project, please see <http://www.jaxen.org/>.
Files: src/java/xpath/org/xmlpull/v1/builder/xpath/saxpath/*
-Copyright: Copyright 2000-2002 werken digital
-License: BSD-saxpath
+Copyright: 2000-2002, werken digital
+License: Apache-1.1-saxpath
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -127,8 +167,8 @@ License: BSD-saxpath
notice, this list of conditions, and the following disclaimer.
.
2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions, and the disclaimer that follows
- these conditions in the documentation and/or other materials
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
provided with the distribution.
.
3. The name "SAXPath" must not be used to endorse or promote products
@@ -139,12 +179,12 @@ License: BSD-saxpath
may "SAXPath" appear in their name, without prior written permission
from the SAXPath Project Management (pm@saxpath.org).
.
- In addition, we request (but do not require) that you include in the
- end-user documentation provided with the redistribution and/or in the
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
software itself an acknowledgement equivalent to the following:
"This product includes software developed by the
SAXPath Project (http://www.saxpath.org/)."
- Alternatively, the acknowledgment may be graphical using the logos
+ Alternatively, the acknowledgment may be graphical using the logos
available at http://www.saxpath.org/
.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -161,12 +201,12 @@ License: BSD-saxpath
SUCH DAMAGE.
.
====================================================================
- This software consists of voluntary contributions made by many
- individuals on behalf of the SAXPath Project and was originally
- created by bob mcwhirter <bob@werken.com> and
- James Strachan <jstrachan@apache.org>. For more information on the
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the SAXPath Project and was originally
+ created by bob mcwhirter <bob@werken.com> and
+ James Strachan <jstrachan@apache.org>. For more information on the
SAXPath Project, please see <http://www.saxpath.org/>.
Files: debian/*
-Copyright: Copyright 2008 Marcus Better <marcus@better.se>
+Copyright: 2008, Marcus Better <marcus@better.se>
License: Apache-1.1
diff --git a/debian/libxpp3-java.dirs b/debian/libxpp3-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libxpp3-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libxpp3-java.doc-base b/debian/libxpp3-java.doc-base
deleted file mode 100644
index 783cd64..0000000
--- a/debian/libxpp3-java.doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: libxpp3-java
-Title: Programmer API for XPP3
-Author: Aleksander Andrzej Slominski <aslom@cs.indiana.edu>
-Abstract: Javadocs for Xml Pull Parser, a streaming pull XML parser for java.
- XPP3 is the successor of XPP2 that implements XmlPull API.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libxpp3-java/api/index.html
-Files: /usr/share/doc/libxpp3-java/api/*.html
diff --git a/debian/libxpp3-java.docs b/debian/libxpp3-java.docs
deleted file mode 100644
index abc24c3..0000000
--- a/debian/libxpp3-java.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.html
-doc/api
diff --git a/debian/libxpp3-java.poms b/debian/libxpp3-java.poms
index 78f0e0d..a4119f3 100644
--- a/debian/libxpp3-java.poms
+++ b/debian/libxpp3-java.poms
@@ -1,4 +1,3 @@
-debian/xpp3.pom
-debian/xpp3_min.pom
-debian/xpp3_xpath.pom
-
+debian/xpp3.pom --java-lib --artifact=build/xpp3-*.jar
+debian/xpp3_min.pom --java-lib --artifact=build/xpp3_min-*.jar --usj-name=xpp3-min
+debian/xpp3_xpath.pom --java-lib --artifact=build/xpp3_xpath-*.jar --usj-name=xpp3-xpath
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index c940d9d..0e9e360 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -1,126 +1,15 @@
--- a/build.xml
+++ b/build.xml
-@@ -220,20 +220,20 @@
-
- <target name="api" depends="prepare,update_api">
- <mkdir dir="${build_api}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_api}" destdir="${build_api}" classpath="${build_api}"/>
- </target>
-
- <target name="impl_min" depends="prepare,api">
- <mkdir dir="${build_classes_min}"/>
- <touch file="${build_classes_min}/${xpp3_tag}_MIN_VERSION"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_api}" destdir="${build_classes_min}" classpath="${build_classes_min}">
- <include name="**/*.java"/>
- <exclude name="**/*Factory.java"/>
- <exclude name="**/*Serializer.java"/>
- </javac>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_impl_min}" destdir="${build_classes_min}" classpath="${build_classes_min}"/>
- <mkdir dir="${build_classes_min}/META-INF/services"/>
- <copy todir="${build_classes_min}/META-INF/services">
-@@ -249,13 +249,13 @@
- </target>
-
- <target name="serializer" depends="prepare,api">
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_impl_serializer}" destdir="${build_classes}" classpath="${build_api}"/>
- </target>
+@@ -255,7 +255,7 @@
<target name="builder" depends="prepare,api">
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
- srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}"/>
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
+ srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}" excludes="javax/xml/" />
</target>
-@@ -267,20 +267,20 @@
-
- <target name="xpath" depends="builder">
- <mkdir dir="${build_xpath}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_xpath}" destdir="${build_xpath}" classpath="${build_api}:${build_classes}"/>
- </target>
-
- <target name="xpath_samples" depends="check_junit,xpath" if="junit_present">
- <mkdir dir="${build_samples}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_xpath_samples}" destdir="${build_samples}" classpath="${build_api}:${build_classes}:${build_xpath}"/>
- </target>
-
- <target name="impl" depends="impl_min,serializer">
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_impl_min}" destdir="${build_classes}" classpath="${build_api}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_impl_standard}" destdir="${build_classes}" classpath="${build_api}"/>
- <mkdir dir="${build_classes}/META-INF/services"/>
- <copy todir="${build_classes}/META-INF/services">
-@@ -298,7 +298,7 @@
-
- <target name="parser_pool" depends="api,update_parser_pool">
- <mkdir dir="${build_classes}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_parser_pool}" destdir="${build_classes}" classpath="${build_api}"/>
- </target>
-
-@@ -312,7 +312,7 @@
-
- <target name="dom2_builder" depends="api,check_dom2,update_dom2_builder">
- <mkdir dir="${build_classes}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_dom2_builder}" destdir="${build_classes}" classpath="${build_api}"/>
- </target>
-
-@@ -328,7 +328,7 @@
-
- <target name="sax2_driver" depends="api,check_sax2,update_sax2_driver">
- <mkdir dir="${build_classes}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_sax2_driver}" destdir="${build_classes}" classpath="${build_api}"/>
- </target>
-
-@@ -344,7 +344,7 @@
-
- <target name="util" depends="api,update_util">
- <mkdir dir="${build_classes}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_util}" destdir="${build_classes}" classpath="${build_api}"/>
- </target>
-
-@@ -358,7 +358,7 @@
-
- <target name="wrapper" depends="api,util,update_wrapper">
- <mkdir dir="${build_classes}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_wrapper}" destdir="${build_classes}" classpath="${build_api}"/>
- </target>
-
-@@ -389,7 +389,7 @@
-
- <target name="xmlpull_samples" depends="api,update_samples">
- <mkdir dir="${build_samples}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
- srcdir="${src_samples}" destdir="${build_samples}" classpath="${build_api}"/>
- </target>
-
-@@ -424,16 +424,16 @@
+@@ -424,10 +424,10 @@
<target name="tests_addons" if="junit_present"
depends="check_junit,impl,update_tests,wrapper,dom2_builder">
@@ -133,18 +22,11 @@
</target>
<target name="tests_main" if="junit_present"
- depends="check_junit,impl,update_tests">
+@@ -435,6 +435,7 @@
<mkdir dir="${build_tests}"/>
-- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
-+ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
srcdir="${src_tests}" destdir="${build_tests}" classpath="${build_api}"
++ encoding="ISO-8859-1"
/>
<copy todir="${build_tests_xml}">
-@@ -502,7 +502,6 @@
- windowtitle="${name} ${version} API"
- doctitle="${name}"
- bottom="${copyright}"
-- link="http://java.sun.com/j2se/1.4/docs/api/"
- />
- </target>
-
+ <fileset dir="${src_xml_tests}">
diff --git a/debian/rules b/debian/rules
index b9673a8..7ac1f7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,19 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/pkg-info.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit
-DEB_ANT_BUILD_TARGET := xpp3 junit apidoc
+%:
+ dh $@ --with maven-repo-helper
-clean::
- -rm -rf doc/api
- -rm -rf debian/tmp
-
-binary-post-install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l debian/xpp3.pom build/xpp3-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=xpp3-min debian/xpp3_min.pom build/xpp3_min-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=xpp3-xpath debian/xpp3_xpath.pom build/xpp3_xpath-$(VERSION).jar
+override_dh_auto_build:
+ dh_auto_build -- xpp3 junit
get-orig-source:
- -uscan --download-version $(VERSION) --force-download --rename
+ -uscan --download-current-version --force-download --rename
get-orig-pom: XPP3_XPATH_VERSION=1.1.3.4.O
get-orig-pom:
- wget -O debian/xpp3.pom http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3/$(VERSION)/xpp3-$(VERSION).pom
- wget -O debian/xpp3_min.pom http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3_min/$(VERSION)/xpp3_min-$(VERSION).pom
+ wget -O debian/xpp3.pom http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3/$(DEB_VERSION_UPSTREAM)/xpp3-$(DEB_VERSION_UPSTREAM).pom
+ wget -O debian/xpp3_min.pom http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3_min/$(DEB_VERSION_UPSTREAM)/xpp3_min-$(DEB_VERSION_UPSTREAM).pom
wget -O debian/xpp3_xpath.pom http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3_xpath/$(XPP3_XPATH_VERSION)/xpp3_xpath-$(XPP3_XPATH_VERSION).pom
- perl -p -i -e 's/<version>$(XPP3_XPATH_VERSION)/<version>$(VERSION)/' debian/xpp3_xpath.pom
-
+ perl -p -i -e 's/<version>$(XPP3_XPATH_VERSION)/<version>$(DEB_VERSION_UPSTREAM)/' debian/xpp3_xpath.pom
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-14 06:02:46 +0000