[wss4j] 06/15: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Jun 27 21:05:11 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository wss4j.

commit 54f8e30e30e229c68c0c9c7b2458409571a9b5b4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 27 21:17:35 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index a5c88c1..c4ffad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wss4j (1.6.15-3) UNRELEASED; urgency=medium
 
   * Added the missing build dependency on junit4
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index fa3207d..659017c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  tony mancill <tmancill at debian.org>
 Build-Depends:
  ant,
- cdbs (>= 0.4.5.3),
  debhelper (>= 10),
  default-jdk,
  junit4,
diff --git a/debian/rules b/debian/rules
index b1754d7..f17ed26 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 $@ --buildsystem=maven
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog.txt
+override_dh_installchangelogs:
+	dh_installchangelogs -- ChangeLog.txt
 
 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/wss4j.git



More information about the pkg-java-commits mailing list