[libwoodstox-java] 04/07: Switch build system to dh 9.
Giovanni Mascellani
gio at moszumanska.debian.org
Sat Sep 10 16:44:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
gio pushed a commit to branch master
in repository libwoodstox-java.
commit 6e31995b651942e1bb8f832b03166b1fa256cdff
Author: Giovanni Mascellani <gio at debian.org>
Date: Sat Sep 10 17:28:39 2016 +0200
Switch build system to dh 9.
---
debian/changelog | 1 +
debian/compat | 2 +-
debian/control | 2 +-
debian/libwoodstox-java.links | 1 -
debian/libwoodstox-java.poms | 2 +-
debian/maven.rules | 4 ++
debian/patches/10-fix-build.xml | 87 --------------------------------------
debian/patches/20-testsuite-enable | 40 ------------------
debian/patches/series | 2 -
debian/rules | 29 +++----------
10 files changed, 14 insertions(+), 156 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cac5d76..6a64b48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libwoodstox-java (1:5.0.3-2) 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> Fri, 12 Aug 2016 10:57:33 +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 165002a..6f4465a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Giovanni Mascellani <gio at debian.org>
Build-Depends-Indep: ant, ant-optional, ant-contrib, default-jdk, junit4,
libmsv-java, libstax2-api-java, librelaxng-datatype-java,
libknopflerfish-osgi-framework-java, libstax-java
-Build-Depends: cdbs, debhelper (>= 5), maven-repo-helper (>= 1.4)
+Build-Depends: debhelper (>= 9), maven-debian-helper
Standards-Version: 3.9.3
Homepage: https://github.com/FasterXML/woodstox
Vcs-Git: https://anonscm.debian.org/git/pkg-java/libwoodstox-java.git
diff --git a/debian/libwoodstox-java.links b/debian/libwoodstox-java.links
deleted file mode 100644
index f42ba4f..0000000
--- a/debian/libwoodstox-java.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/woodstox-core-lgpl.jar usr/share/java/wstx-lgpl.jar
diff --git a/debian/libwoodstox-java.poms b/debian/libwoodstox-java.poms
index e7265d5..43e746b 100644
--- a/debian/libwoodstox-java.poms
+++ b/debian/libwoodstox-java.poms
@@ -1 +1 @@
-woodstox-core-lgpl.patched.pom --has-package-version --artifact=dist/woodstox-core.jar --java-lib
+pom.xml --no-parent
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..c7fd3f9
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,4 @@
+s/javax.xml.stream/stax/ stax-api * s/.*/debian/ * *
+s/net.java.dev.msv/com.sun.msv.datatype.xsd/ xsdlib * s/.*/debian/ * *
+s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/ * *
+junit junit * s/.*/4.x/ * *
diff --git a/debian/patches/10-fix-build.xml b/debian/patches/10-fix-build.xml
deleted file mode 100644
index 1362506..0000000
--- a/debian/patches/10-fix-build.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Giovanni Mascellani <gio at debian.org>
-Subject: Fix build.xml
-Last-Update: 2011-08-21
-Forwarded: not-needed
-
-This patch fixed build.xml file. It does these changes:
- * Put in the classpath libraries from Debian packages, instead
- of the bundled JARs;
- * Use Debian-distributed JAR for stax2-api instead of assuming
- to have copy of the code in the compilation tree;
- * Reduce the dist target to only things needed for Debian.
-
-Index: libwoodstox-java/build.xml
-===================================================================
---- libwoodstox-java.orig/build.xml 2011-08-21 10:34:06.000000000 +0200
-+++ libwoodstox-java/build.xml 2011-08-21 10:36:01.000000000 +0200
-@@ -57,14 +57,13 @@
-
- <!-- jars needed for compilation -->
- <path id="classpath.compile">
-- <fileset dir="${dir.lib}" includes="stax-api*.jar" />
-- <fileset dir="${dir.lib}" includes="sax2.jar" />
-- <!-- these are needed for optional MSV-based validators -->
-- <fileset dir="${dir.lib}/msv" includes="*.jar" />
-- <!-- 17-Dec-2008, tatu: adding OSGi bundle activation
-- support, to register providers as services
-- -->
-- <fileset dir="${dir.lib}/osgi" includes="*.jar" />
-+ <fileset file="/usr/share/java/stax-api.jar" />
-+ <fileset file="/usr/share/java/stax2-api.jar" />
-+ <fileset file="/usr/share/java/msv-core.jar" />
-+ <fileset file="/usr/share/java/xsdlib.jar" />
-+ <fileset file="/usr/share/java/relaxngDatatype.jar" />
-+ <fileset file="/usr/share/java/knopflerfish-framework.jar" />
-+ <fileset file="/usr/share/java/junit4.jar" />
- </path>
- <path id="junit-libs">
- <fileset dir="${dir.lib}">
-@@ -102,11 +101,6 @@
- <include name="lib/msv/*.jar" />
- </patternset>
-
-- <import file="build-osgi.xml" />
-- <import file="build-coverage.xml" />
-- <import file="build-maven-deploy.xml" />
-- <import file="repackage-msv.xml" />
--
- <!--*********************************************************************-->
- <!-- The readme target shows a brief description of all targets -->
- <!-- supported by this ant build file -->
-@@ -208,7 +202,7 @@
- </javac>
- </target>
-
-- <target name="compile.woodstox" depends="prepare,copy-resources,compile.stax2">
-+ <target name="compile.woodstox" depends="prepare,copy-resources">
- <javac srcdir="${dir.src.java}" destdir="${dir.build.classes.woodstox}"
- includeantruntime="false"
- source="1.4" target="1.4"
-@@ -254,7 +248,7 @@
- <!-- Dummy target that just includes all individual jars...
- (OSGi ones from included file)
- -->
-- <target name="jars" depends="jars.osgi, jar.stax2test, repackage-msv" />
-+ <target name="jars" depends="jar.stax2test" />
-
- <!-- This jar is only needed for testing purposes, to specify
- - which Stax implementation to use
-@@ -310,6 +304,18 @@
-
- </javadoc>
- </target>
-+
-+ <target name="debiandist" depends="compile.woodstox">
-+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="/usr/share/java/ant-contrib.jar"/>
-+ <property name="classpath.prop.colon" refid="classpath.compile"/>
-+ <propertyregex property="classpath.prop" input="${classpath.prop.colon}"
-+ global="true" regexp=":" replace=" "/>
-+ <jar basedir="${dir.build.classes.woodstox}" destfile="${dir.dist}/woodstox-core.jar">
-+ <manifest>
-+ <attribute name="Class-Path" value="${classpath.prop}"/>
-+ </manifest>
-+ </jar>
-+ </target>
-
- <target name="dist" depends="compile,jars,javadoc">
- <!-- First, let's copy the binary jars to dist -->
diff --git a/debian/patches/20-testsuite-enable b/debian/patches/20-testsuite-enable
deleted file mode 100644
index 57f9922..0000000
--- a/debian/patches/20-testsuite-enable
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Thierry Carrez <thierry.carrez at ubuntu.com>
-Subject: Enable test suite
-Last-Update: 2012-10-11
-Forwarded: not-needed
-
-Enable test suite, but don't fail even if some test goes wrong.
-
-Index: libwoodstox-java/build.xml
-===================================================================
---- libwoodstox-java.orig/build.xml 2011-08-21 11:00:48.000000000 +0200
-+++ libwoodstox-java/build.xml 2011-08-21 11:26:23.000000000 +0200
-@@ -476,7 +476,6 @@
- <pathelement path="${dir.build.classes.woodstox}" />
- <pathelement path="${dir.build.classes.stax2}" />
- <pathelement location="${dir.classes.test}" />
-- <path refid="junit-libs"/>
- </classpath>
- </junit>
- </target>
-@@ -494,9 +493,7 @@
- <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 -->
-@@ -522,10 +519,8 @@
- <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>
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 83f20eb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-10-fix-build.xml
-20-testsuite-enable
diff --git a/debian/rules b/debian/rules
index 0150bc1..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_JARS := ant-nodeps junit ant-junit ant-trax
-DEB_ANT_BUILD_TARGET := debiandist
-DEB_BUILDDIR := .
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_CHECK_TARGET := test
+JAVA_HOME := /usr/lib/jvm/default-java
-clean::
- -rm -Rf build doc test dist woodstox-core-lgpl.patched.pom
- mh_clean
-
-configure/libwoodstox-java::
- # Patch the POM to include the correct version number
- cp src/maven/woodstox-core-lgpl.pom woodstox-core-lgpl.patched.pom
- sed -i woodstox-core-lgpl.patched.pom -e 's/@VERSION@/$(DEB_UPSTREAM_VERSION)/g'
- sed -i woodstox-core-lgpl.patched.pom -e 's/javax.xml.stream/stax/'
-
-install/libwoodstox-java::
- mh_install -plibwoodstox-java
+%:
+ dh $@ --buildsystem=maven
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libwoodstox-java.git
More information about the pkg-java-commits
mailing list