[java-gnome] 01/07: Build with the DH sequencer instead of CDBS (Closes: #849669)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java-gnome.

commit 7a933266320a9fbae204e477bba53206172cbeb0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 11:23:42 2017 +0100

    Build with the DH sequencer instead of CDBS (Closes: #849669)
---
 debian/changelog |  7 +++++++
 debian/control   |  3 +--
 debian/rules     | 25 ++++++++++++++-----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fdf62d4..b05644f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+java-gnome (4.1.3-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS (Closes: #849669)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 Jan 2017 11:01:01 +0100
+
 java-gnome (4.1.3-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index aa5492e..c09e75e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Manu Mahajan <manu at codepencil.com>,
            Onkar Shinde <onkarshinde at ubuntu.com>,
            Guillaume Mazoyer <respawneral at gmail.com>
-Build-Depends: cdbs,
-               debhelper (>= 9~),
+Build-Depends: debhelper (>= 9~),
                default-jdk,
                hicolor-icon-theme,
                junit,
diff --git a/debian/rules b/debian/rules
index 8787f82..cc56bb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,30 @@
 #!/usr/bin/make -f
 
-# We ran the build in verbose mode so buildd log scanner can analyze the output
-# of the build.
-V=1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
 DEB_MAKE_ENVVARS += CFLAGS="$(shell dpkg-buildflags --get CFLAGS)"
 DEB_MAKE_ENVVARS += LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
 DEB_MAKE_ENVVARS += V=1
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/jni jdk=/usr/lib/jvm/default-java
-DEB_ARCH_PACKAGES = libjava-gnome-jni
-DEB_INDEP_PACKAGES = libjava-gnome-java-doc libjava-gnome-java
 
 ifneq (,$(filter $(DEB_HOST_ARCH), i386 amd64 powerpc))
 DEB_MAKE_ENVVARS += DISPLAY=":99"
 DEB_MAKE_ENVVARS += G_ENABLE_DIAGNOSTIC=0
-DEB_MAKE_BUILD_TARGET += doc
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH), hppa))
 DEB_MAKE_ENVVARS += CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -ffunction-sections"
 endif
 
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir=/usr/lib/jni jdk=/usr/lib/jvm/default-java
+
+override_dh_auto_build-arch:
+	$(DEB_MAKE_ENVVARS) dh_auto_build -- all
+
+override_dh_auto_build-indep:
+	$(DEB_MAKE_ENVVARS) dh_auto_build -- doc
+
+override_dh_auto_test:
+
 get-orig-source:
 	uscan --force-download --rename

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