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

commit cb43ccaefbbb13406bd8bb6fd1eda402082bfc2a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jul 31 19:12:12 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 8bbc900..dcbbbc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ fastinfoset (1.2.12-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Fixed the build failure caused by the streambuffer update (Closes: #833077)
+  * 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 dd2187f..e183387 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,10 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends:
- cdbs,
  debhelper (>= 9),
  default-jdk,
  javahelper,
- maven-debian-helper (>= 1.5)
+ maven-debian-helper (>= 2.0)
 Build-Depends-Indep: junit4, libstax-java, libstreambuffer-java, libxsom-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/fastinfoset.git
diff --git a/debian/rules b/debian/rules
index 54e0ae5..1ad608b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
-
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f fastinfoset/new-UBL-example-refvocab.finf fastinfoset/new-UBL-example.finf
 
 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/fastinfoset.git