[metainf-services] 01/04: Build with the DH sequencer instead of CDBS

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Feb 8 22:29:11 GMT 2016


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

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

commit 5dd42d3b3b832c45bd5da0ce19f44b54d6a055f0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Feb 8 23:20:08 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 7103e06..e426698 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+metainf-services (1.6-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Feb 2016 23:18:35 +0100
+
 metainf-services (1.6-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1a49c4e..cd40b6a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 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 (>= 9), default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
 Build-Depends-Indep:
  default-jdk-doc,
  libmaven-compiler-plugin-java (>= 2.0.2),
diff --git a/debian/rules b/debian/rules
index b76c54a..d755df6 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 $@ --buildsystem=maven
 
 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/metainf-services.git



More information about the pkg-java-commits mailing list