[libstax2-api-java] 04/08: Switch build system to dh 9.
Giovanni Mascellani
gio at moszumanska.debian.org
Sat Sep 10 16:44:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
gio pushed a commit to branch master
in repository libstax2-api-java.
commit 63aa22eebb7252b69fbd0ce4d8cab41c4672aa93
Author: Giovanni Mascellani <gio at debian.org>
Date: Sat Sep 10 12:32:28 2016 +0200
Switch build system to dh 9.
---
debian/build.xml | 528 ------------------------------------------
debian/changelog | 1 +
debian/compat | 2 +-
debian/control | 8 +-
debian/libstax2-api-java.poms | 2 +-
debian/maven.ignoreRules | 1 +
debian/maven.rules | 1 +
debian/rules | 29 +--
debian/stax2-api.pom | 50 ----
9 files changed, 16 insertions(+), 606 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 85fd136..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" standalone='yes'?>
-<project name="Woodstox XML processor" basedir="." default="readme">
- <!-- Source directories -->
- <property name="dir.src" location="${basedir}/src" />
- <property name="dir.src.java" location="${dir.src}/java" />
- <property name="dir.src.samples" location="${dir.src}/samples" />
- <property name="dir.src.test" location="${dir.src}/test" />
- <property name="dir.resource" location="${dir.src}/resources" />
- <property name="dir.releasenotes" location="${basedir}/release-notes" />
-
- <!-- Libs -->
- <property name="dir.lib" location="${basedir}/lib" />
- <!-- Build-related -->
- <property name="dir.build" location="${basedir}/build" />
- <property name="dir.build.classes" location="${dir.build}/classes" />
- <property name="dir.build.classes.stax2" location="${dir.build.classes}/stax2" />
- <property name="dir.build.classes.woodstox" location="${dir.build.classes}/woodstox" />
- <property name="dir.build.classes.samples" location="${dir.build.classes}/samples" />
-
- <!-- Documentation -->
- <property name="dir.doc" location="${basedir}/doc" />
- <property name="dir.javadoc" location="${dir.build}/javadoc" />
- <!-- Test suite -->
- <property name="dir.test" location="${basedir}/test" />
- <property name="dir.classes.test" location="${dir.test}/classes" />
- <property name="dir.test.results" location="${dir.test}/results" />
- <property name="dir.test.xmlresults" location="${dir.test.results}/xml" />
- <!-- Distribution -->
- <property name="dir.dist" location="${basedir}/dist" />
- <property name="dir.snapshot" location="${basedir}/build/snapshot" />
-
- <!-- Version information -->
-
- <!-- Woodstox version info: -->
- <property name="IMPL_TITLE" value="Woodstox XML-processor" />
- <property name="IMPL_VERSION" value="4.1.1" />
- <property name="IMPL_VENDOR" value="http://woodstox.codehaus.org" />
- <property name="API_TITLE" value="Stax 1.0 API" />
- <property name="API_VERSION" value="1.0.0" />
- <property name="API_VENDOR" value="http://jcp.org/en/jsr/detail?id=173" />
-
- <!-- Extended API, working title "Stax2" (not version 2.0, but 2/squared)
- -->
- <property name="STAX2_TITLE" value="Stax2 API" />
- <property name="STAX2_VERSION" value="3.1.1" />
- <property name="STAX2_VENDOR" value="http://woodstox.codehaus.org" />
-
- <!-- And finally version dependency spec between Woodstox core
- and Stax API package.
-
- 29-Jan-2009, TSa: ranges won't work without additional
- repository metadata. And that can only be properly
- supported by a real Maven build, in woodstox 5. So,
- for now we'll hard-code exact version dep.
- -->
- <property name="REQ_STAX2_VERSION" value="${STAX2_VERSION}" />
-
- <!-- jars needed for compilation -->
- <path id="classpath.compile">
- </path>
- <path id="junit-libs">
- <fileset dir="${dir.lib}">
- <include name="test/junit*.jar" />
- </fileset>
- </path>
-
- <!-- Source files to include in source packages (tar, zip) -->
- <patternset id="woodstox-dist-src-files">
- <include name="src/java/com/**/*.java" />
- <include name="src/samples/**/*.java" />
- <include name="src/resources/*" />
- <include name="build.xml" />
- <include name="project.xml" />
- </patternset>
- <patternset id="stax2-dist-src-files">
- <include name="src/java/org/codehaus/**/*.java" />
- </patternset>
-
- <patternset id="wstx-dist-misc-files">
- <include name="src/test/**/*.java" />
- <include name="src/test/**/*.xml" />
- <include name="src/test/**/*.dtd" />
- <include name="src/java/**/*.html" />
- <include name="src/maven/*.pom" />
- <include name="release-notes/*" />
- <include name="release-notes/asl/*" />
- <include name="release-notes/bsd/*" />
- <include name="release-notes/lgpl/*" />
- <!-- need jars too; at least the api jar, but let's copy
- all for now... it's nice to have the unit tests in there
- too. This way src packages are proper subsets of binary ones
- -->
- <include name="lib/*.jar" />
- <include name="lib/msv/*.jar" />
- </patternset>
-
- <!--*********************************************************************-->
- <!-- The readme target shows a brief description of all targets -->
- <!-- supported by this ant build file -->
- <!--*********************************************************************-->
- <target name="readme">
- <echo message = "${ant.project.name}'s Available Targets" />
- <echo message = "---------------------------------------------------" />
- <echo message = "1) readme - Displays this information (default target)." />
- <echo message = "2) clean - Remove any generated files/directories." />
- <echo message = "3) compile - Compile all ${ant.project.name} code (including tests and samples)" />
- <echo message = "4) jars - Compile and create all jars for non-test ${ant.project.name} code (see build.xml for specific ones)." />
- <echo message = "5) javadoc - Generate ${ant.project.name} code documentation." />
- <echo message = " for JUnit tests." />
- <echo message = "6) test - Run JUnit tests." />
- <echo message = "7) dist - Create distribution directory and copy necessary files there" />
- <echo message = "8) all - Run the clean, compile, javadoc," />
- <echo message = " test and dist targets." />
- <echo message = "" />
- <echo message = "Available command-line arguments:" />
- <echo message = "---------------------------------" />
- <echo message = "-Dlicense : allowed values 'asl', 'lgpl' (chooses license to use for jars)" />
- </target>
-
- <target name="prepare">
- <!-- make build directories -->
- <mkdir dir="${dir.build}" />
- <mkdir dir="${dir.build.classes}" />
- <mkdir dir="${dir.build.classes.stax2}" />
- <mkdir dir="${dir.build.classes.woodstox}" />
- <mkdir dir="${dir.build.classes.samples}" />
-
- <!-- make docs directories -->
- <mkdir dir="${dir.doc}" />
- <mkdir dir="${dir.javadoc}" />
-
- <!-- make test output directories -->
- <mkdir dir="${dir.test}" />
- <mkdir dir="${dir.classes.test}" />
- <mkdir dir="${dir.test.results}" />
- <mkdir dir="${dir.test.xmlresults}" />
-
- <!-- and finally distribution dir -->
- <mkdir dir="${dir.dist}" />
- <mkdir dir="${dir.snapshot}" />
- </target>
-
- <!-- ***********************************************
- - supporting dummy tasks
- - ***********************************************-->
-
- <!-- This task ensures that license is either set to a
- - valid value, or can use the default (ASL)
- -->
- <target name="check_license">
- <!-- Let's set license to default ("asl") if not
- explicitly specified on command-line args
- -->
- <property name="license" value="asl" />
- <!-- And then check that explicitly set one was valid
- - (default one will always be....)
- -->
- <condition property="license_ok">
- <or>
- <equals arg1="${license}" arg2="asl" />
- <equals arg1="${license}" arg2="lgpl" />
- </or>
- </condition>
- <fail unless="license_ok"
- message="Unrecognized license property value '${license}': excepted either 'asl' (for ASL2.0) or 'lgpl' (for LGPL2.1)"
- />
- <echo message="Ok, using license '${license}' for jar(s)." />
- </target>
-
- <!-- ***********************************************
- - clean - Removes all generated files/directories
- - ***********************************************-->
-
- <target name="clean">
- <delete dir="${dir.build}"/>
- <delete dir="${dir.doc}"/>
- <delete dir="${dir.test}"/>
- <delete dir="${dir.dist}"/>
- <delete file="cobertura.ser" />
- </target>
-
- <target name="compile" depends="compile.woodstox, compile.samples, compile.test" />
-
- <target name="compile.stax2" depends="prepare">
- <javac srcdir="${dir.src.java}" destdir="${dir.build.classes.stax2}"
- includeantruntime="false"
- source="1.4" target="1.4"
- debug="true"
- >
-<!-- Uncomment to see warnings: too verbose for default, due to deprecation warns
- <compilerarg value="-Xlint:deprecation" />
--->
- <include name="org/codehaus/stax2/**/*.java" />
- <classpath refid="classpath.compile" />
- </javac>
- </target>
-
- <target name="compile.woodstox" depends="prepare,copy-resources,compile.stax2">
- <javac srcdir="${dir.src.java}" destdir="${dir.build.classes.woodstox}"
- includeantruntime="false"
- source="1.4" target="1.4"
- debug="true"
- >
-<!-- Uncomment to see warnings: too verbose for default, due to deprecation warns
- <compilerarg value="-Xlint:deprecation" />
--->
- <include name="com/ctc/**/*.java" />
- <include name="test/**/*.java" />
- <classpath refid="classpath.compile" />
- <classpath>
- <pathelement path="${dir.build.classes.stax2}" />
- </classpath>
- </javac>
- </target>
-
- <target name="compile.samples" depends="compile.woodstox">
- <!-- 03-Aug-2006, TSa: Let's also compile samples, to ensure they
- won't get obsolete with impl/api changes
- -->
- <javac srcdir="${dir.src.samples}" destdir="${dir.build.classes.samples}"
- includeantruntime="false"
- source="1.4" target="1.4">
- <include name="*.java" />
- <classpath refid="classpath.compile" />
- <classpath>
- <pathelement path="${dir.build.classes.stax2}" />
- </classpath>
- </javac>
- </target>
-
- <target name="copy-resources" depends="prepare">
- <mkdir dir="${dir.build.classes.woodstox}/META-INF/services" />
- <copy toDir="${dir.build.classes.woodstox}/META-INF/services">
- <fileset dir="${dir.resource}">
- <include name="javax.xml.stream.*" />
- <include name="org.codehaus.stax2.*" />
- </fileset>
- </copy>
- </target>
-
- <!-- Dummy target that just includes all individual jars...
- (OSGi ones from included file)
- -->
- <target name="jars" depends="jar.stax2test" />
-
- <!-- This jar is only needed for testing purposes, to specify
- - which Stax implementation to use
- -->
- <target name="jar.resources" depends="compile,copy-resources">
- <jar jarfile="${dir.build}/service-def-${IMPL_VERSION}.jar" filesonly="true" >
- <fileset dir="${dir.build.classes.woodstox}">
- <include name="META-INF/services/*" />
- </fileset>
- </jar>
- </target>
-
- <!-- 15-Mar-2008, TSa: Let's also package up Stax2 compatibility
- test suite, for other stax2 impls to use
- -->
- <target name="jar.stax2test" depends="compile.test">
- <jar jarfile="${dir.build}/stax2test-${STAX2_VERSION}.jar" filesonly="true" compress="true">
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Specification-Title" value="${STAX2_TITLE}"/>
- <attribute name="Specification-Version" value="${STAX2_VERSION}"/>
- <attribute name="Specification-Vendor" value="${STAX2_VENDOR}"/>
- <attribute name="Implementation-Title" value="${STAX2_TITLE}"/>
- <attribute name="Implementation-Version" value="${STAX2_VERSION}"/>
- <attribute name="Implementation-Vendor" value="${STAX2_VENDOR}"/>
- </manifest>
- <fileset dir="${dir.classes.test}">
- <include name="org/codehaus/stax/test/**/*.class" />
- <include name="stax2/**/*.class" />
- </fileset>
- </jar>
- </target>
-
- <target name="javadoc" depends="prepare">
- <!-- Build a dirpath that contains just the "source" tree -->
- <javadoc windowtitle="${ant.project.name}"
- destdir="${dir.javadoc}"
- author="true"
- version="true">
- <packageset dir="${dir.src.java}" defaultexcludes="yes">
- <include name="org/codehaus/stax2/**" />
- <include name="com/ctc/**" />
- </packageset>
- <classpath refid="classpath.compile" />
-
- <!-- Need to link Stax API and regular JDK 5 classes -->
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
- <link href="http://woodstox.codehaus.org/javadoc/stax-api/1.0" />
- <group title="Woodstox" packages="com.ctc.wstx*" />
- <group title="Stax2"
- packages="org.codehaus.stax2*"
- />
-
- </javadoc>
- </target>
-
- <target name="debiandist" depends="compile.stax2">
- <jar basedir="${dir.build.classes.stax2}" destfile="${dir.dist}/stax2-api.jar">
- <manifest>
- <attribute name="Class-Path" value="/usr/share/java/stax-api.jar"/>
- </manifest>
- </jar>
- </target>
-
- <target name="dist" depends="compile,jars,javadoc">
- <!-- First, let's copy the binary jars to dist -->
- <copy todir="${dir.dist}">
- <fileset dir="${dir.build}" includes="woodstox*.jar" />
- <fileset dir="${dir.build}" includes="stax2*.jar" />
- <fileset dir="${dir.lib}/msv" includes="msv-core*.jar" />
- <fileset dir="${dir.lib}/msv" includes="xsdlib*.jar" />
- </copy>
- <!-- Including MSV jars (note: ones we have repackaged)
- -->
- <copy todir="${dir.dist}">
- <fileset dir="${dir.build}" includes="woodstox-msv-*.jar" />
- </copy>
-
- <!-- Then let's create the source distribution tar packages
- -->
- <property name="SRC_CORE" value="woodstox-core-src-${IMPL_VERSION}" />
- <property name="SRC_STAX2" value="stax2-api-src-${STAX2_VERSION}" />
-
- <!-- Need to first copy to a tmp dir, to get the additional
- directory (so tar/zip contents won't explode directly
- in current dir)
- -->
- <property name="DIR_CORE" value="woodstox-${IMPL_VERSION}" />
- <property name="DIR_STAX2" value="stax2-${STAX2_VERSION}" />
- <delete dir="${dir.build}/${DIR_CORE}" />
- <mkdir dir="${dir.build}/${DIR_CORE}" />
- <delete dir="${dir.build}/${DIR_STAX2}" />
- <mkdir dir="${dir.build}/${DIR_STAX2}" />
-
- <copy todir="${dir.build}/${DIR_CORE}">
- <fileset dir="${basedir}">
- <patternset refid="woodstox-dist-src-files" />
- <patternset refid="wstx-dist-misc-files" />
- </fileset>
- </copy>
- <copy todir="${dir.build}/${DIR_STAX2}">
- <fileset dir="${basedir}">
- <patternset refid="stax2-dist-src-files" />
- </fileset>
- </copy>
-
- <delete file="${dir.dist}/${SRC_CORE}.tar.gz" />
- <tar basedir="${dir.build}"
- includes="${DIR_CORE}/**"
- destfile="${dir.dist}/${SRC_CORE}.tar.gz"
- compression="gzip"
- />
- <delete file="${dir.dist}/${SRC_STAX2}.tar.gz" />
- <tar basedir="${dir.build}"
- includes="${DIR_STAX2}/**"
- destfile="${dir.dist}/${SRC_STAX2}.tar.gz"
- compression="gzip"
- />
-
- <!-- as well as zip -->
- <zip basedir="${dir.build}"
- includes="${DIR_CORE}/**"
- destfile="${dir.dist}/${SRC_CORE}.zip"
- />
- <zip basedir="${dir.build}"
- includes="${DIR_STAX2}/**"
- destfile="${dir.dist}/${SRC_STAX2}.zip"
- />
-
- <!-- And create source jars for IDE support -->
- <!-- Can't really use patternset, as that'd include "src/java" -->
- <jar basedir="${dir.src.java}" filesonly="true" compress="true"
- destfile="${dir.dist}/woodstox-core-asl-${IMPL_VERSION}-sources.jar"
- includes="com/**/*.java"
- />
- <jar basedir="${dir.src.java}" filesonly="true" compress="true"
- destfile="${dir.dist}/woodstox-core-lgpl-${IMPL_VERSION}-sources.jar"
- includes="com/ctc/wstx/**/*.java"
- />
- <jar basedir="${dir.src.java}" filesonly="true" compress="true"
- destfile="${dir.dist}/stax2-api-${STAX2_VERSION}-sources.jar"
- includes="org/codehaus/stax2/**/*.java"
- />
-
- <!-- Then copy javadocs -->
- <copy todir="${dir.dist}">
- <fileset dir="${dir.javadoc}/.." includes="javadoc/**/*" />
- </copy>
- <!-- Plus, let's also just copy README and compatibility files, in
- addition to being included in source package
- -->
- <copy todir="${dir.dist}" >
- <fileset dir="." includes="release-notes/*" />
- <fileset dir="." includes="release-notes/asl/*" />
- <fileset dir="." includes="release-notes/bsd/*" />
- <fileset dir="." includes="release-notes/lgpl/*" />
- </copy>
- <!-- And also additional Maven stuff -->
- <copy todir="${dir.dist}">
- <fileset dir="${dir.src}/maven" includes="w*.pom" />
- <globmapper from="*.pom" to="*-${IMPL_VERSION}.pom" />
- <filterset>
- <filter token="VERSION" value="${IMPL_VERSION}" />
- <filter token="REQ_STAX2_VERSION" value="${REQ_STAX2_VERSION}" />
- </filterset>
- </copy>
- <copy todir="${dir.dist}">
- <fileset dir="${dir.src}/maven" includes="stax2*.pom" />
- <globmapper from="*.pom" to="*-${STAX2_VERSION}.pom" />
- <filterset>
- <filter token="VERSION" value="${STAX2_VERSION}" />
- <filter token="REQ_STAX2_VERSION" value="${REQ_STAX2_VERSION}" />
- </filterset>
- </copy>
-
- <!-- 17-Jun-2009, tatu: Trying to make Maven snapshots work...
- -->
- <copy todir="${dir.snapshot}">
- <fileset dir="${dir.src}/maven" includes="w*.pom" />
- <globmapper from="*.pom" to="*-${IMPL_VERSION}-SNAPSHOT.pom" />
- <filterset>
- <filter token="VERSION" value="${IMPL_VERSION}-SNAPSHOT" />
- <filter token="REQ_STAX2_VERSION" value="${REQ_STAX2_VERSION}-SNAPSHOT" />
- </filterset>
- </copy>
- <copy todir="${dir.snapshot}">
- <fileset dir="${dir.src}/maven" includes="stax2*.pom" />
- <globmapper from="*.pom" to="*-${STAX2_VERSION}-SNAPSHOT.pom" />
- <filterset>
- <filter token="VERSION" value="${STAX2_VERSION}-SNAPSHOT" />
- <filter token="REQ_STAX2_VERSION" value="${REQ_STAX2_VERSION}-SNAPSHOT" />
- </filterset>
- </copy>
- <!-- Let's also validate well-formedness of resulting POM files -->
- <xmlvalidate lenient="true">
- <!-- lenient: check only well-formedness, no dtd/schema (yet?) -->
- <fileset dir="${dir.dist}" includes="*.pom" />
- <fileset dir="${dir.snapshot}" includes="*.pom" />
- </xmlvalidate>
-
- </target>
-
- <target name="all" depends="clean,javadoc,test,dist">
- <!-- This target simply depends on others to do its job -->
- </target>
-
- <!--*********************************************************************-->
- <!-- Tasks from here down are in support of junit tests. -->
- <!--*********************************************************************-->
- <target name="all-tests" depends="test" />
-
- <!-- Running a single Unit Test -->
- <target name="test.single" depends="compile.test">
- <fail unless="test" message="Must define -Dtest" />
- <!-- showoutput 'yes' to allow outputting debug msgs... -->
- <junit fork="no" maxmemory="128M" showoutput="yes" printsummary="yes">
- <formatter type="plain" usefile="no" />
- <test name="${test}" />
- <classpath refid="classpath.compile" />
- <classpath>
- <pathelement path="${dir.build.classes.woodstox}" />
- <pathelement path="${dir.build.classes.stax2}" />
- <pathelement location="${dir.classes.test}" />
- <path refid="junit-libs"/>
- </classpath>
- </junit>
- </target>
-
- <!-- Compiling and running Woodstox-specific tests
- - (including, for now, Stax2 tests)
- -->
-
- <target name="compile.test" depends="compile.woodstox">
- <javac srcdir="${dir.src.test}" destdir="${dir.classes.test}"
- includeantruntime="false"
- source="1.4" target="1.4"
- debug="true"
- >
- <include name="**/*.java" />
- <classpath refid="classpath.compile" />
- <classpath>
- <pathelement path="${dir.build.classes.stax2}"/>
- <pathelement path="${dir.build.classes.woodstox}"/>
- <path refid="junit-libs"/>
- </classpath>
- </javac>
- <!-- 08-Jun-2009, tatu: need to copy some test files too -->
- <copy todir="${dir.classes.test}">
- <fileset dir="${dir.src.test}">
- <include name="**/*.wsdl" />
- <include name="**/*.xml" />
- </fileset>
- </copy>
- </target>
-
- <target name="test" depends="compile.test">
- <!-- showoutput 'yes' to allow outputting debug msgs... -->
- <junit fork="yes" forkmode="once" maxmemory="128M"
- printsummary="yes" haltonfailure="no" showoutput="yes">
- <batchtest fork="yes" todir="${dir.test.xmlresults}">
- <fileset dir="${dir.classes.test}">
- <!-- Need to exclude inner classes... -->
- <exclude name="**/*$*.class"/>
- <include name="**/Test*.class"/>
- </fileset>
- </batchtest>
- <formatter type="xml" />
- <classpath refid="classpath.compile" />
- <classpath>
- <pathelement path="${dir.build.classes.stax2}" />
- <pathelement path="${dir.build.classes.woodstox}" />
- <pathelement location="${dir.classes.test}" />
- <path refid="junit-libs"/>
- </classpath>
- </junit>
-
- <junitreport todir="${dir.test.results}">
- <fileset dir="${dir.test.xmlresults}">
- <include name="TEST-*.xml" />
- </fileset>
- <report todir="${dir.test.results}" />
- </junitreport>
- </target>
-</project>
diff --git a/debian/changelog b/debian/changelog
index 3c9a22c..00f4e0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libstax2-api-java (4.0.0-1) UNRELEASED; urgency=medium
* Update project homepage and debian/watch URL.
* New upstream release.
* Remove traces of tarball sanitizer, which is not required anymore.
+ * Switch build system to dh 9.
-- Giovanni Mascellani <gio at debian.org> Wed, 10 Aug 2016 23:52:23 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index f35ae1d..6dab0d8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ Section: java
Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Giovanni Mascellani <gio at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), maven-repo-helper (>= 1.4)
-Build-Depends-Indep: default-jdk, libstax-java
+Build-Depends: debhelper (>= 9), maven-repo-helper (>= 1.4),
+ libmaven-bundle-plugin-java, libmaven-javadoc-plugin-java,
+ libmaven-compiler-plugin-java, libstax-java
+Build-Depends-Indep: default-jdk
Standards-Version: 3.9.2
Homepage: https://github.com/FasterXML/stax2-api
Vcs-Git: https://anonscm.debian.org/git/pkg-java/libstax2-api-java.git
@@ -12,7 +14,7 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-java/libstax2-api-java.git
Package: libstax2-api-java
Architecture: all
-Depends: ${misc:Depends}, libstax-java
+Depends: ${misc:Depends}, ${maven:Depends}
Description: Extension to StAX API for parsing XML documents
StAX 2 is an extension to StAX (Streaming API for XML), an Java API to read
and write XML documents. It adds some features over the original API,
diff --git a/debian/libstax2-api-java.poms b/debian/libstax2-api-java.poms
index 9e1d7c6..43e746b 100644
--- a/debian/libstax2-api-java.poms
+++ b/debian/libstax2-api-java.poms
@@ -1 +1 @@
-debian/stax2-api.patched.pom --has-package-version --artifact=dist/stax2-api.jar --java-lib
+pom.xml --no-parent
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..94627cc
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+org.apache.maven.plugins maven-release-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8e2313b
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+s/javax.xml.stream/stax/ stax-api * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index f748256..6d7053b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,10 @@
#!/usr/bin/make -f
+# -*- makefile -*-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_ANT_COMPILER := modern
-DEB_ANT_BUILD_TARGET := debiandist
-DEB_BUILDDIR := .
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_CLEAN_TARGET := clean
+JAVA_HOME := /usr/lib/jvm/default-java
-clean::
- -rm -Rf build doc test dist build.xml debian/stax2-api.patched.pom
- mh_clean
-
-configure/libstax2-api-java::
- # Move build.xml to the root dir
- cp debian/build.xml build.xml
-
- # Patch the POM to include the correct version number
- cp debian/stax2-api.pom debian/stax2-api.patched.pom
- sed -i debian/stax2-api.patched.pom -e 's/@VERSION@/$(DEB_UPSTREAM_VERSION)/g'
-
-install/libstax2-api-java::
- mh_install -plibstax2-api-java
+%:
+ dh $@ --buildsystem=maven
diff --git a/debian/stax2-api.pom b/debian/stax2-api.pom
deleted file mode 100644
index bd84650..0000000
--- a/debian/stax2-api.pom
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
- <!-- General information -->
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <packaging>jar</packaging>
- <name>Stax2 API</name>
- <version>@VERSION@</version>
- <description>Stax2 API is an extension to basic Stax 1.0 API that adds significant new functionality, such as full-featured bi-direction validation interface and high-performance Typed Access API.
-</description>
-
- <!-- Contact information -->
-
- <!-- In future, should there be separate Stax2 home page? -->
- <url>http://woodstox.codehaus.org/StAX2</url>
- <issueManagement>
- <url>http://jira.codehaus.org/browse/WSTX</url>
- </issueManagement>
-
- <!-- Dependency information -->
-
- <dependencies>
- <!-- Stax API jar is needed; 1.0-2 seems to be the last "official"
- version prior to JDK 6 that bundles API
- -->
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0-2</version>
- </dependency>
- </dependencies>
-
- <!-- Licensing -->
- <licenses>
- <license>
- <name>The BSD License</name>
- <url>http://www.opensource.org/licenses/bsd-license.php</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <organization>
- <name>Codehaus</name>
- <url>http://www.codehaus.org/</url>
- </organization>
-
-</project>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libstax2-api-java.git
More information about the pkg-java-commits
mailing list