[statcvs] 42/43: 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 statcvs.

commit 72143394ffbd6a43d59de238f8918490a7de9dc7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 18 21:38:43 2018 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog    |  1 +
 debian/control      |  1 -
 debian/rules        | 32 +++++---------------------------
 debian/statcvs.dirs |  2 --
 4 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef59f20..753caa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 statcvs (1:0.7.0.dfsg-7) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.4
   * Switch to debhelper level 11
diff --git a/debian/control b/debian/control
index 036b3fe..8a886a9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  Christian Bayle <bayle at debian.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 11),
  default-jdk,
  javahelper (>= 0.36),
diff --git a/debian/rules b/debian/rules
index 5ac4cc0..02cd220 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,9 @@
 #!/usr/bin/make -f
-# debian/rules for statcvs, based on the one from Batik (uses CDBS)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export CLASSPATH=/usr/share/java/jfreechart.jar:/usr/share/java/jdom1.jar
 
-# 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
-
-VERSION=$(subst .dfsg,,$(DEB_UPSTREAM_VERSION))
-
-JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar \
-	junit jcommon jfreechart jdom1
-DEB_ANT_COMPILER     := modern
-DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_BUILDDIR         := .
-DEB_ANT_BUILDFILE    := build.xml
-DEB_ANT_CLEAN_TARGET := clean
-
-
-print-version:
-	echo $(VERSION)
-	echo $(DEB_UPSTREAM_VERSION)
-
-JH_INSTALLLIBS_ARGS = --upstream-version=$(VERSION)
+%:
+	dh $@ --with javahelper
 
+override_dh_auto_build:
+	dh_auto_build -- jar javadoc
diff --git a/debian/statcvs.dirs b/debian/statcvs.dirs
deleted file mode 100644
index 64f6fc8..0000000
--- a/debian/statcvs.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin
-/usr/share/java

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