[animal-sniffer] 04/11: 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 animal-sniffer.

commit 4a757cd951da3f4f5296a573d06aa4ca9bbeb5b9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 27 10:51:52 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 4247aef..ffa5766 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 animal-sniffer (1.11-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index 4e9a210..d2e2c16 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,9 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Matthias Schmitz <matthias at sigxcpu.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 9),
  default-jdk,
- maven-debian-helper (>= 1.4)
+ maven-debian-helper (>= 2.0)
 Build-Depends-Indep:
  default-jdk-doc,
  junit,
diff --git a/debian/rules b/debian/rules
index d5ba014..aba914b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
-DEB_MAVEN_BUILD_TARGET := install
-
-#binary-post-install/lib$(PACKAGE)-java::
-#	mh_installpoms -plib$(PACKAGE)-java
-#	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar 
-
-clean::
-	mh_clean
-	-rm mvn-build
-	-rm -r debian/null
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

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