[disruptor] 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 disruptor.

commit 0ea69018265541f83596b3a71deae56a8836310e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 22 16:19:07 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 8a458fe..e00026f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ disruptor (3.3.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Updated debian/pom.xml
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 22 Jan 2016 15:38:30 +0100
 
diff --git a/debian/control b/debian/control
index 4a65543..a416c3b 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: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/disruptor.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/disruptor.git
diff --git a/debian/rules b/debian/rules
index 8a9741a..f5b437d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,24 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
+export VERSION   = $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p')
 
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven
 
-DEB_INSTALL_CHANGELOGS_ALL := README.md
-
-pre-build::
+override_dh_auto_configure:
 	cp debian/pom.xml .
-	mh_patchpoms -plibdisruptor-java --keep-pom-version
+	dh_auto_configure
+
+override_dh_installchangelogs:
+	dh_installchangelogs -- README.md
 
-clean::
+override_dh_clean:
+	dh_clean
 	rm -f pom.xml
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename
 
 get-orig-pom:
-	wget http://central.maven.org/maven2/com/lmax/disruptor/$(DEB_UPSTREAM_VERSION)/disruptor-$(DEB_UPSTREAM_VERSION).pom -O debian/pom.xml
+	wget http://central.maven.org/maven2/com/lmax/disruptor/$(VERSION)/disruptor-$(VERSION).pom -O debian/pom.xml

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