[batik] 03/08: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository batik.

commit 0a2a9fff92db4a0abd0ca2fc9e3ec236dd301636
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 2 11:07:16 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog             |  1 +
 debian/control               |  2 +-
 debian/libbatik-java.install |  1 +
 debian/rules                 | 73 +++++++++++++-------------------------------
 4 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eaf980a..7d64f13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 batik (1.9-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
 
diff --git a/debian/control b/debian/control
index fbc85cd..cc788cf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Wolfgang Baer <WBaer at gmx.de>,
            Vincent Fourmond <fourmond at debian.org>,
            Onkar Shinde <onkarshinde at ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 10)
+Build-Depends: debhelper (>= 10)
 Build-Depends-Indep: ant,
                      default-jdk,
                      javahelper,
diff --git a/debian/libbatik-java.install b/debian/libbatik-java.install
new file mode 100644
index 0000000..6a8efce
--- /dev/null
+++ b/debian/libbatik-java.install
@@ -0,0 +1 @@
+debian/wrappers/*   /usr/bin/
diff --git a/debian/rules b/debian/rules
index c403521..4a01324 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,56 +1,25 @@
 #!/usr/bin/make -f
-# debian/rules for batik (uses CDBS)
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export JITC_PROCESSOR_TYPE=6
-
-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
+
+export CLASSPATH=/usr/share/java/js.jar:/usr/share/java/xalan2.jar:/usr/share/java/xmlgraphics-commons.jar
+
+UPSTREAM_VERSION = 1.9
+
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper
+
+override_dh_auto_build:
+	dh_auto_build -- all-jar libs-jar ext-jar transcoder-jar jars
+
+override_dh_auto_install:
+	dh_auto_install
+
+	# Install batik-libs.jar
+	install -m 644 batik-$(UPSTREAM_VERSION)/lib/batik-libs-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-libs-$(UPSTREAM_VERSION).jar
+	ln -s batik-libs-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-libs.jar
+
+	# 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
 
 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