[mina2] 01/05: 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 mina2.

commit 78da95e08ea3b2bd56d1f911947b09235c2dc0e4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Dec 11 11:06:54 2015 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog         |  6 ++++++
 debian/control           |  5 ++---
 debian/maven.ignoreRules |  2 ++
 debian/rules             | 16 +++++++++++-----
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92df5c4..7d2588d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mina2 (2.0.9-2) UNRELEASED; urgency=medium
+
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 11 Dec 2015 09:14:13 +0100
+
 mina2 (2.0.9-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 55e270e..3e886fa 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
            Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0.1~)
 Build-Depends-Indep: libjzlib-java,
                      junit4,
                      libbuild-helper-maven-plugin-java,
@@ -16,8 +16,7 @@ Build-Depends-Indep: libjzlib-java,
                      libslf4j-java,
                      libspring-beans-java,
                      libspring-context-java,
-                     libtomcat8-java,
-                     maven-repo-helper
+                     libtomcat8-java
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/mina2.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/mina2.git
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 66fc7d4..4e13ebc 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,6 +1,8 @@
 
 org.apache.mina mina-core jar * sources *
 org.easymock easymockclassextension jar * * *
+org.apache.maven.plugins maven-jxr-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
 org.apache.felix maven-bundle-plugin * * * *
+org.codehaus.mojo rat-maven-plugin * * * *
diff --git a/debian/rules b/debian/rules
index e92ef20..67ad8c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +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
 
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven
 
-DEB_MAVEN_ARGS := -f src/pom.xml
-DEB_MAVEN_DOC_TARGET = install javadoc:aggregate -DskipTests
+override_dh_auto_build:
+	dh_auto_build -- -f src/pom.xml package javadoc:aggregate
+
+override_dh_auto_test:
+	dh_auto_test -- -f src/pom.xml test
+
+override_dh_auto_install:
+	dh_auto_install -- -f src/pom.xml
 
 get-orig-source:
 	uscan --download-current-version --force-download --rename

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