[portlet-api-2.0-spec] 04/07: 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 portlet-api-2.0-spec.

commit 59721a51e9621cc1b4344879c3cd36aa852ac2af
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 30 17:13:47 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 1cf8735..c81d2c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 portlet-api-2.0-spec (1.0-2.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.8 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index 7e5bd7e..cb48e34 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 0.12)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0)
 Build-Depends-Indep: libservlet2.5-java, default-jdk-doc, libservlet2.5-java-doc, libmaven-javadoc-plugin-java 
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/portlet-api-2.0-spec.git
diff --git a/debian/rules b/debian/rules
index b22ae77..d755df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-# Debug Build
-#export DH_VERBOSE    = 1
-#JAVA_OPTS            += -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#DEB_MAVEN_ARGS       += -e -X
-
-
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/portlet-api-2.0-spec.git