[eigenbase-farrago] 07/09: 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 eigenbase-farrago.

commit 3a0c1b73248bee1dd2faa061b30676da9b62d49c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 28 11:27:57 2016 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/rules     | 15 ++++++---------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35e77ea..1a64ae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eigenbase-farrago (0.9.0-1.1) UNRELEASED; urgency=medium
   * Non-maintainer upload.
   * Install the Maven artifacts
   * Removed the JRE dependency from the binary package
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index db3251e..e576cb5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: eigenbase-farrago
 Section: java
 Priority: optional
 Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, ant, maven-repo-helper
+Build-Depends: debhelper (>= 9), default-jdk, ant, maven-repo-helper
 Build-Depends-Indep: libeigenbase-resgen-java, junit, default-jdk-doc, junit-doc
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/eigenbase-resgen.git
diff --git a/debian/rules b/debian/rules
index 46330cf..66821ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper
 
-JAVA_HOME            := /usr/lib/jvm/default-java
+override_dh_auto_build:
+	dh_auto_build -- -f debian/build.xml jar
 
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_CLEAN_TARGET := clean
-
-install/libeigenbase-farrago-java::
-	mh_install
+override_dh_auto_clean:
+	dh_auto_clean -- -f debian/build.xml clean
 
 get-orig-source:
 	uscan --force-download --rename

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