[jcharts] 13/14: 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 jcharts.

commit 1a3b0b81d785fdcb6ca2451e6738af54572c5d6a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 17 16:31:28 2017 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/clean     |  3 +++
 debian/control   |  1 -
 debian/rules     | 26 ++++++++++++--------------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a13c17..34e4916 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jcharts (0.7.5-5) UNRELEASED; urgency=medium
 
   * Team upload.
   * Fixed the build failure with Java 9 (Closes: #875580)
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d05cd55
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+build/garbage/
+build/javadocs/
+build/jCharts-*.jar
diff --git a/debian/control b/debian/control
index eaf988f..6172d53 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 Build-Depends:
  ant,
  ant-optional,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
diff --git a/debian/rules b/debian/rules
index 2a5c695..5cb48b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,20 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export CLASSPATH=/usr/share/java/batik.jar:/usr/share/java/servlet-api-3.1.jar
 
-JAVA_HOME		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE 	:= build/build.xml
-DEB_JARS		:= batik servlet-api-3.1
-ANT_ARGS		:= -Dbatik.classpath=/usr/share/java/batik.jar -Dant.build.javac.source=1.7
-DEB_ANT_BUILD_TARGET	:= jar javadocs
+%:
+	dh $@ --buildsystem=ant
 
-clean::
-	rm -rf build/garbage
-	rm -rf build/javadocs
-	rm -f build/jCharts-$(DEB_UPSTREAM_VERSION).jar
+override_dh_auto_build:
+	dh_auto_build -- -f build/build.xml -Dbatik.classpath=/usr/share/java/batik.jar -Dant.build.javac.source=1.7 jar javadocs
 
-install/libjcharts-java::
-	dh_install build/jCharts-$(DEB_UPSTREAM_VERSION).jar usr/share/java/
-	dh_link /usr/share/java/jCharts-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jcharts.jar
+override_dh_auto_test:
+
+override_dh_auto_clean:
+
+override_dh_auto_install:
+	dh_install build/jCharts-0.7.5.jar usr/share/java/
+	dh_link /usr/share/java/jCharts-0.7.5.jar usr/share/java/jcharts.jar
 
 get-orig-source:
 	uscan --verbose --force-download

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jcharts.git