[statsvn] 36/37: 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 statsvn.

commit 4e3bcf401a4f6e2d758cf4b7f6298cad98f9cf81
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 19 23:49:51 2018 +0200

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

diff --git a/debian/changelog b/debian/changelog
index f900f2c..85ec661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 statsvn (0.7.0.dfsg-8) 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 180ee78..eb0bab3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 11),
  default-jdk,
  javahelper (>= 0.36),
diff --git a/debian/rules b/debian/rules
index 3d85902..df29818 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,9 @@
 #!/usr/bin/make -f
-# debian/rules for statsvn, based on the one from Batik (uses CDBS)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export CLASSPATH=/usr/share/java/svnkit.jar
 
-VERSION=$(subst .dfsg,,$(DEB_UPSTREAM_VERSION))
+%:
+	dh $@ --with javahelper
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar \
-	junit jcommon jfreechart svnkit statcvs
-DEB_ANT_COMPILER     := modern
-DEB_BUILDDIR         := .
-DEB_ANT_BUILDFILE    := build.xml
-DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := dist
-
-print-version:
-	echo $(VERSION)
-	echo $(DEB_UPSTREAM_VERSION)
-
-JH_INSTALLLIBS_ARGS = --upstream-version=$(VERSION)
+override_dh_auto_build:
+	dh_auto_build -- dist
diff --git a/debian/statsvn.dirs b/debian/statsvn.dirs
deleted file mode 100644
index 64f6fc8..0000000
--- a/debian/statsvn.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/statsvn.git