[batik] 01/01: Switch to maven for build
Christopher Stuart Hoskin
mans0954 at moszumanska.debian.org
Sat Sep 9 16:20:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
mans0954 pushed a commit to branch maven-build
in repository batik.
commit 39a2b2cbab37247280060be09ba908063b75a1da
Author: Christopher Hoskin <mans0954 at debian.org>
Date: Sat Sep 9 16:32:47 2017 +0100
Switch to maven for build
---
debian/changelog | 7 ++++++
debian/control | 8 ++++--
debian/libbatik-java.install | 1 +
debian/libbatik-java.poms | 60 ++++++++++++++++++++++----------------------
debian/maven.rules | 1 +
debian/rules | 55 +++-------------------------------------
6 files changed, 48 insertions(+), 84 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ed15e81..4467455 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+batik (1.9-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Switch to maven for build
+
+ -- Christopher Hoskin <mans0954 at debian.org> Sat, 09 Sep 2017 16:31:58 +0100
+
batik (1.9-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index ce810ec..2f18da5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Wolfgang Baer <WBaer at gmx.de>,
Vincent Fourmond <fourmond at debian.org>,
Onkar Shinde <onkarshinde at ubuntu.com>
Standards-Version: 4.0.0
-Build-Depends: cdbs, debhelper (>= 9)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: ant,
default-jdk,
javahelper,
@@ -17,7 +17,11 @@ Build-Depends-Indep: ant,
libxml-commons-external-java,
libxmlgraphics-commons-java (>= 2.0.1),
maven-repo-helper,
- rhino
+ rhino,
+ junit4,
+ libmaven-assembly-plugin-java,
+ maven-debian-helper,
+ jython
Homepage: https://xmlgraphics.apache.org/batik/
Vcs-Git: https://anonscm.debian.org/git/pkg-java/batik.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/batik.git
diff --git a/debian/libbatik-java.install b/debian/libbatik-java.install
new file mode 100644
index 0000000..609bc83
--- /dev/null
+++ b/debian/libbatik-java.install
@@ -0,0 +1 @@
+debian/wrappers/* usr/bin/
diff --git a/debian/libbatik-java.poms b/debian/libbatik-java.poms
index 528acf8..b5aea8f 100644
--- a/debian/libbatik-java.poms
+++ b/debian/libbatik-java.poms
@@ -26,38 +26,38 @@
# Empty by default. [mh_install]
#
./pom.xml
-./batik-all/pom.xml --artifact=batik-1.9/lib/batik-all-1.9.jar --java-lib
-./batik-anim/pom.xml --artifact=batik-1.9/lib/batik-anim-1.9.jar --java-lib
-./batik-awt-util/pom.xml --artifact=batik-1.9/lib/batik-awt-util-1.9.jar --java-lib
-./batik-bridge/pom.xml --artifact=batik-1.9/lib/batik-bridge-1.9.jar --java-lib
-./batik-codec/pom.xml --artifact=batik-1.9/lib/batik-codec-1.9.jar --java-lib
-./batik-constants/pom.xml --ignore-pom
-./batik-css/pom.xml --artifact=batik-1.9/lib/batik-css-1.9.jar --java-lib
-./batik-dom/pom.xml --artifact=batik-1.9/lib/batik-dom-1.9.jar --java-lib
-./batik-extension/pom.xml --artifact=batik-1.9/lib/batik-extension-1.9.jar --java-lib
-./batik-ext/pom.xml --artifact=batik-1.9/lib/batik-ext-1.9.jar --java-lib
-./batik-gui-util/pom.xml --artifact=batik-1.9/lib/batik-gui-util-1.9.jar --java-lib
-./batik-gvt/pom.xml --artifact=batik-1.9/lib/batik-gvt-1.9.jar --java-lib
-./batik-i18n/pom.xml --ignore-pom
-./batik-parser/pom.xml --artifact=batik-1.9/lib/batik-parser-1.9.jar --java-lib
-./batik-rasterizer-ext/pom.xml --ignore-pom
-./batik-rasterizer/pom.xml --artifact=batik-1.9/batik-rasterizer-1.9.jar --java-lib
-./batik-script/pom.xml --artifact=batik-1.9/lib/batik-script-1.9.jar --java-lib
-./batik-slideshow/pom.xml --artifact=batik-1.9/batik-slideshow-1.9.jar --java-lib
-./batik-squiggle-ext/pom.xml --ignore-pom
-./batik-squiggle/pom.xml --artifact=batik-1.9/batik-squiggle-1.9.jar --java-lib
-./batik-svgbrowser/pom.xml --ignore-pom
-./batik-svg-dom/pom.xml --artifact=batik-1.9/lib/batik-svg-dom-1.9.jar --java-lib
-./batik-svggen/pom.xml --artifact=batik-1.9/lib/batik-svggen-1.9.jar --java-lib
-./batik-svgpp/pom.xml --artifact=batik-1.9/batik-svgpp-1.9.jar --java-lib
-./batik-svgrasterizer/pom.xml --ignore-pom
-./batik-swing/pom.xml --artifact=batik-1.9/lib/batik-swing-1.9.jar --java-lib
+./batik-all/pom.xml --java-lib
+./batik-anim/pom.xml --java-lib
+./batik-awt-util/pom.xml --java-lib
+./batik-bridge/pom.xml --java-lib
+./batik-codec/pom.xml --java-lib
+./batik-constants/pom.xml
+./batik-css/pom.xml --java-lib
+./batik-dom/pom.xml --java-lib
+./batik-extension/pom.xml --java-lib
+./batik-ext/pom.xml --java-lib
+./batik-gui-util/pom.xml --java-lib
+./batik-gvt/pom.xml --java-lib
+./batik-i18n/pom.xml
+./batik-parser/pom.xml --java-lib
+./batik-rasterizer-ext/pom.xml
+./batik-rasterizer/pom.xml --java-lib
+./batik-script/pom.xml --java-lib
+./batik-slideshow/pom.xml --java-lib
+./batik-squiggle-ext/pom.xml
+./batik-squiggle/pom.xml --java-lib
+./batik-svgbrowser/pom.xml
+./batik-svg-dom/pom.xml --java-lib
+./batik-svggen/pom.xml --java-lib
+./batik-svgpp/pom.xml --java-lib
+./batik-svgrasterizer/pom.xml
+./batik-swing/pom.xml --java-lib
./batik-test/pom.xml --ignore-pom
./batik-test-svg/pom.xml --ignore-pom
./batik-test-swing/pom.xml --ignore-pom
./batik-test-util/pom.xml --ignore-pom
-./batik-transcoder/pom.xml --artifact=batik-1.9/lib/batik-transcoder-1.9.jar --java-lib
-./batik-ttf2svg/pom.xml --artifact=batik-1.9/batik-ttf2svg-1.9.jar --java-lib
-./batik-util/pom.xml --artifact=batik-1.9/lib/batik-util-1.9.jar --java-lib
-./batik-xml/pom.xml --artifact=batik-1.9/lib/batik-xml-1.9.jar --java-lib
+./batik-transcoder/pom.xml --java-lib
+./batik-ttf2svg/pom.xml --java-lib
+./batik-util/pom.xml --java-lib
+./batik-xml/pom.xml --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..35566f0
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+junit junit jar s/.*/4.x/ * *
diff --git a/debian/rules b/debian/rules
index c403521..51fb3d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,56 +1,7 @@
#!/usr/bin/make -f
-# debian/rules for batik (uses CDBS)
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export JAVA_HOME=/usr/lib/jvm/default-java
-export JITC_PROCESSOR_TYPE=6
+%:
+ dh $@ --buildsystem=maven
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-arch = $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bfs \
- gnujaxp js xalan2 xml-apis-ext xmlgraphics-commons
-DEB_ANT_COMPILER := modern
-DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder-jar jars
-DEB_BUILDDIR := .
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_CLEAN_TARGET := clean
-
-# Increasing memory of the compiler
-ANT_OPTS := -Xms256m -Xmx256m -Dbuild.sysclasspath=only
-
-LIBRARY=batik
-
-UPSTREAM_VERSION = $(subst +dfsg,,$(DEB_UPSTREAM_VERSION))
-
-LIB_NAMES = libs
-install/libbatik-java::
- # Install poms
- mh_install -v -plibbatik-java
-
- # Install batik-all.jar and batik-libs.jar
- for name in $(LIB_NAMES); do \
- install -m 644 batik-$(UPSTREAM_VERSION)/lib/batik-$$name-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name-$(UPSTREAM_VERSION).jar; \
- ln -s batik-$$name-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name.jar; \
- done
- #Link batik.jar and batik-1.9.jar to batik-all-1.9.jar
- ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$(UPSTREAM_VERSION).jar; \
- ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik.jar; \
-
- # Install wrapper scripts
- install -d debian/libbatik-java/usr/bin
- for prog in debian/wrappers/* ; do \
- install -t debian/libbatik-java/usr/bin/ $$prog ; \
- done
-
-clean::
- mh_clean
-
-get-orig-source:
- uscan --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/batik.git
More information about the pkg-java-commits
mailing list