[robust-http-client] 05/06: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Sep 14 06:57:19 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository robust-http-client.

commit 9c07f495e86c2b9acdab2a07691486539bf7143a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 14 08:52:20 2017 +0200

    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 660a36c..a496627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 robust-http-client (1.2-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Added the missing build dependency on junit
   * Standards-Version updated to 4.1.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 9105b63..51442ad 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,12 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <james.page at ubuntu.com>
 Build-Depends:
- cdbs,
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
  junit,
  libmaven-javadoc-plugin-java,
- maven-debian-helper
+ maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.0
 Vcs-Git: git://anonscm.debian.org/pkg-java/robust-http-client.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/robust-http-client.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/robust-http-client.git



More information about the pkg-java-commits mailing list