[felix-main] 04/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-main.

commit 20338e476def53e9261b04d04e530c544736acf7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 3 00:08:40 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/clean     |  3 +++
 debian/control   |  1 -
 debian/rules     | 21 ++++++---------------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a2595f..c3c22d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ felix-main (5.0.0-5) UNRELEASED; urgency=medium
   * Team upload.
   * Fixed the build failure cause by the update of felix-bundlerepository
     (Closes: #866858)
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..ff793aa
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+bundle/
+bin/
+conf/
diff --git a/debian/control b/debian/control
index e552976..5822f73 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  libfelix-bundlerepository-java (>= 2.0.8~),
diff --git a/debian/rules b/debian/rules
index 3823986..1f8585f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@
 
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_DESTDIR = $(CURDIR)/debian/felix-main
+override_dh_auto_install:
+	dh_auto_install
 
-install/felix-main::
-	install -m 755 -D debian/felix-framework.sh $(DEB_DESTDIR)/usr/bin/felix-framework
-
-clean::
-	-rm -rf $(CURDIR)/bundle $(CURDIR)/bin $(CURDIR)/conf
+	install -m 755 -D debian/felix-framework.sh debian/felix-main/usr/bin/felix-framework
 
 get-orig-source:
-	uscan \
-		--no-symlink \
-		--upstream-version $(VERSION) \
-		--download-version $(VERSION) \
-		--force-download
+	uscan --no-symlink --download-current-version --force-download

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