[gs-collections] 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 gs-collections.

commit 1a7a329f13d83490d0cf5995b6b717bac8c624d2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 15 16:14:50 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 4b2df88..67e36ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gs-collections (5.1.0-2) UNRELEASED; urgency=medium
 
   * Fixed the build failure with Maven 3 (Closes: #808022)
   * Removed the patches no longer required with Maven 3
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 15 Dec 2015 15:06:52 +0100
 
diff --git a/debian/control b/debian/control
index 0045971..994f707 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +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),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                junit4,
                libbuild-helper-maven-plugin-java,
diff --git a/debian/rules b/debian/rules
index 5fca4fb..1376397 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
 
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven
+
+override_dh_auto_install:
+	dh_auto_install
 
-common-install-indep::
 	# Remove the generator and the test classes from the final package
 	rm -Rf debian/libgs-collections-java/usr/share/maven-repo/com/goldmansachs/gs-collections-code-generator
 	rm -Rf debian/libgs-collections-java/usr/share/maven-repo/com/goldmansachs/gs-collections-code-generator-maven-plugin
@@ -15,8 +17,5 @@ common-install-indep::
 	rm -Rf debian/libgs-collections-java/usr/share/java/gs-collections-testutils*.jar
 	rm -Rf debian/libgs-collections-java/usr/share/java/*-tests*.jar
 
-clean::
-	find . -type d -name target | xargs -r rm -Rf
-
 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/gs-collections.git