[felix-framework] 03/05: 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 felix-framework.

commit 513d76cdf0db88fb5a9c2a822aa7958cd4c1044e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 27 13:19:55 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 6090ca2..ea9c64b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 felix-framework (4.6.1-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index 28fee41..81e5ece 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
  Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
  Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends:
- cdbs,
  debhelper (>= 9),
  default-jdk,
  libasm4-java,
@@ -16,7 +15,7 @@ Build-Depends:
  libosgi-annotation-java,
  libosgi-compendium-java (>= 5.0.0),
  libosgi-core-java (>= 6.0.0),
- maven-debian-helper (>= 1.4)
+ maven-debian-helper (>= 2.0)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/felix-framework.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/felix-framework.git
diff --git a/debian/rules b/debian/rules
index 3c07322..aba914b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan \
-		--no-symlink \
-		--upstream-version $(VERSION) \
-		--download-version $(VERSION) \
-		--force-download
+	uscan --download-current-version --force-download --no-symlink

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-framework.git