[shiro] 03/04: 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 shiro.

commit 20038a378a2f1b8ce6368158acf32881e303d97b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Aug 19 19:28:44 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index a55cf3b..c9aa7df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ shiro (1.2.5-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Fixed the build failure with Spring Framework 4.3.x (Closes: #834471)
+  * Build with the DH sequencer instead of CDBS
   * Use secure Vcs-* URLs
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 19 Aug 2016 14:11:12 +0200
diff --git a/debian/control b/debian/control
index de41f2f..586cd78 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
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper
 Build-Depends-Indep: libaspectj-java,
                      libbuild-helper-maven-plugin-java,
                      libcommons-beanutils-java,
diff --git a/debian/rules b/debian/rules
index 4ec75b3..1cdfe40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@ --buildsystem=maven
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
-DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES
+override_dh_installchangelogs:
+	dh_installchangelogs -- RELEASE-NOTES
 
 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/shiro.git