[jtidy] 26/30: 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 jtidy.

commit 6d62646419828b99b9a0fc1c2a599cc3a2b92ff2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 18 09:42:22 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index a39c689..179b0a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ jtidy (7+svn20110807-5) UNRELEASED; urgency=low
 
   [ Emmanuel Bourg ]
   * Removed Michael Koch from the uploaders (Closes: #654040, #884609)
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.2
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 1b4fdeb..8660d10 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
  ant-doc,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
@@ -14,7 +13,7 @@ Build-Depends:
  liblog4j1.2-java,
  libmaven-javadoc-plugin-java,
  libslf4j-java,
- maven-debian-helper (>= 1.4)
+ maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.2
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jtidy.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jtidy.git
diff --git a/debian/rules b/debian/rules
index e7df169..ec38b7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,4 @@
 #!/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
-DEB_PATCHPOMS_ARGS := --set-version=$(DEB_UPSTREAM_VERSION)
+%:
+	dh $@ --buildsystem=maven

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