[antlr4] 02/03: 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 antlr4.

commit dda55ee2d12542a8d7a5cfdb65dde911b023e23b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 21 10:43:39 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 5d2f3f0..c0b6940 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 antlr4 (4.5.1-2) UNRELEASED; urgency=medium
 
   * Fixed the build failure with Maven 3 (Closes: #808498)
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 21 Dec 2015 10:21:58 +0100
 
diff --git a/debian/control b/debian/control
index cea391e..6ed7557 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: antlr3-maven-plugin,
-               cdbs,
                debhelper (>= 9),
                default-jdk,
                default-jdk-doc,
diff --git a/debian/rules b/debian/rules
index 7ff5976..5e462c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
+#DEB_MAVEN_BUILD_TARGET := install
 
-JAVA_HOME              := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET   := javadoc:jar javadoc:aggregate
-DEB_MAVEN_BUILD_TARGET := install
+%:
+	dh $@ --buildsystem=maven
 
-before-mvn-build::
+override_dh_auto_build:
 	cp -r debian/generated-sources/antlr4/* runtime/Java/src/
+	dh_auto_build
+
+override_dh_auto_clean:
+	dh_auto_clean
 
-clean::
 	rm -Rf target runtime/Java/target tool/target antlr4-maven-plugin/target
 
 	# Remove the generated file copied in the source directory

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