[velocity] 04/08: 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 velocity.

commit b71c62ec04774aeb7a6718ce4d65fe66b43c3a93
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 21 15:48:49 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index fd20d4b..def2313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 velocity (1.7-4.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
+  * Build with the DH sequencer instead of CDBS
   * debian/control:
     - Removed the deprecated DM-Upload-Allowed field
   * Moved the package to Git
diff --git a/debian/control b/debian/control
index cb9b07f..729bd5b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
            Brian Thomason <brian.thomason at eucalyptus.com>
-Build-Depends: cdbs,
-               debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 7.0.50~),
                default-jdk,
                maven-debian-helper (>= 1.4)
 Build-Depends-Indep: ant,
diff --git a/debian/rules b/debian/rules
index f26b4b4..d755df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +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
-
-# site plugin does not work yet, needs maven-project-info-reports-plugin
-#DEB_MAVEN_DOC_TARGET = javadoc:jar site:site
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --debug --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/velocity.git