[apache-directory-jdbm] 05/06: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jul 17 11:05:00 UTC 2017


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository apache-directory-jdbm.

commit e64ea5686114e48fe38455de4f390f5505ddf34a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 17 12:57:46 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index e1bbdeb..d976c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 apache-directory-jdbm (2.0.0~M2-2) UNRELEASED; urgency=medium
 
   * Added the missing build dependency on junit4 (Closes: #867890)
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
   * Use a secure Vcs-Git URL
diff --git a/debian/control b/debian/control
index 05a790b..4c75396 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs,
-               debhelper (>= 10),
+Build-Depends: debhelper (>= 10),
                default-jdk,
                junit4,
                libmaven-bundle-plugin-java,
                libslf4j-java,
-               maven-debian-helper (>= 1.5)
+               maven-debian-helper (>= 2.2)
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/apache-directory-jdbm.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/apache-directory-jdbm.git
diff --git a/debian/rules b/debian/rules
index 13e00dc..a5a03fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	find . -name MANIFEST.MF | xargs -r rm
 
 get-orig-source:

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



More information about the pkg-java-commits mailing list