[commons-jcs] 24/27: 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 commons-jcs.

commit e480a9d2115e755b357624bc219053cd3185493d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 16 19:07:41 2015 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/control          | 5 +----
 debian/maven.properties | 1 +
 debian/rules            | 9 +++------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index f9f688d..fd9af46 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Bas Couwenberg <sebastic at debian.org>
-Build-Depends: debhelper (>= 9),
-               cdbs,
-               default-jdk,
-               maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
 Build-Depends-Indep: ant,
                      junit4,
                      libatinject-jsr330-api-java,
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..81cec92
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1 @@
+maven.test.failure.ignore=true
diff --git a/debian/rules b/debian/rules
index 07c1fb6..6463a91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,9 @@
 #!/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
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_MAVEN_ARGS := -Dmaven.test.failure.ignore=true
-DEB_MAVEN_BUILD_TARGET := install
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

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