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

commit 730e668470a0fe0601a6646d3eeb5c0cae24435f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 24 16:19:11 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index e207c04..10a440c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 tika (1.5-5) UNRELEASED; urgency=medium
 
   * Enabled JHighlight support
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index 954ef6a..f376630 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: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0)
 Build-Depends-Indep: bnd (>= 2.1.0),
                      libapache-mime4j-java (>= 0.7.2-3),
                      libapache-poi-java (>= 3.10),
diff --git a/debian/rules b/debian/rules
index f285496..aba914b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,7 @@
 #!/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_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

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