[debian-edu-commits] debian-edu/ 08/26: Build with the DH sequencer instead of CDBS

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository guacamole-client.

commit 6196b2ea5f105599957d00249e8397d2f175b500
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 6 00:08:51 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index ed73704..68eda24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ guacamole-client (0.8.3-1.2) UNRELEASED; urgency=medium
     - Changed the Vcs-* field to point to the Alioth packaging repository
     - Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 06 Jan 2016 00:00:54 +0100
 
diff --git a/debian/control b/debian/control
index 5ff855a..992b78c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: guacamole-client
 Priority: extra
 Maintainer: Michael Jumper <mike.jumper at guac-dev.org>
-Build-Depends: po-debconf, debhelper (>= 9), cdbs, default-jdk | java6-sdk, maven-debian-helper, libmaven-war-plugin-java, libmaven-assembly-plugin-java, libmaven-plugin-testing-java, libslf4j-java, libservlet2.5-java
+Build-Depends: po-debconf, debhelper (>= 9), default-jdk | java6-sdk, maven-debian-helper, libmaven-war-plugin-java, libmaven-assembly-plugin-java, libmaven-plugin-testing-java, libslf4j-java, libservlet2.5-java
 Standards-Version: 3.9.6
 Section: net
 Vcs-Git: git://anonscm.debian.org/pkg-java/guacamole-client.git
diff --git a/debian/rules b/debian/rules
index 5e3b590..4721cb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,6 @@
 #!/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
-
-# maven-debian-helper leaves empty mvn-build after clean
-# po-debconf docs recommend running debconf-updatepo here
-clean::
-	debconf-updatepo
-	$(RM) mvn-build
+export JAVA_HOME = /usr/lib/jvm/default-java
 
+%:
+	dh $@ --buildsystem=maven

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-client.git