[geronimo-jta-1.1-spec] 05/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 geronimo-jta-1.1-spec.

commit 281237ea73f7da652e976cb3ff219080a1a8ad7d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 24 12:08:40 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 0e81646..fbc4de4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 geronimo-jta-1.1-spec (1.1.1-4) UNRELEASED; urgency=low
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index cddb247..a439fbb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,11 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends:
- cdbs,
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
  libmaven-javadoc-plugin-java,
- maven-debian-helper (>= 1.4)
+ maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/geronimo-jta-1.1-spec.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/geronimo-jta-1.1-spec.git
diff --git a/debian/rules b/debian/rules
index b76c54a..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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
+%:
+	dh $@
 
 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/geronimo-jta-1.1-spec.git