[apache-directory-server] 01/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 apache-directory-server.

commit d8124d5cec0d7ec4c6b98418139d524dfe2dd56e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 17 11:50:50 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index e2129a8..20af01e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache-directory-server (2.0.0~M15-4) UNRELEASED; urgency=medium
+
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 17 May 2016 11:44:27 +0200
+
 apache-directory-server (2.0.0~M15-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index bd9f41e..d142619 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: ant,
-               cdbs (>= 0.4.123),
                debhelper (>= 9),
                default-jdk,
                dh-systemd (>= 1.5),
@@ -23,7 +22,7 @@ Build-Depends: ant,
                libmina2-java,
                libplexus-utils2-java (>= 2.x),
                libslf4j-java,
-               maven-debian-helper (>= 1.5)
+               maven-debian-helper (>= 2.0)
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/apache-directory-server.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/apache-directory-server.git
diff --git a/debian/rules b/debian/rules
index 4a061cf..fc15908 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,8 @@
 #!/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
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

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