Build with the DH sequencer instead of CDBS (Closes: #849669)

7a933266 · Emmanuel Bourg · 515e30b8 · 7a933266 · 7a933266 · 7a933266
Commit 7a933266 authored 8 years ago by Emmanuel Bourg
--- a/debian/changelog
+++ b/debian/changelog
+java-gnome (4.1.3-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer instead of CDBS (Closes: #849669)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 10 Jan 2017 11:01:01 +0100
+
 java-gnome (4.1.3-4) unstable; urgency=medium

  * Team upload.

--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.or
 Uploaders: Manu Mahajan <manu@codepencil.com>,
           Onkar Shinde <onkarshinde@ubuntu.com>,
           Guillaume Mazoyer <respawneral@gmail.com>
-Build-Depends: cdbs,
-               debhelper (>= 9~),
+Build-Depends: debhelper (>= 9~),
               default-jdk,
               hicolor-icon-theme,
               junit,

--- a/debian/rules
+++ b/debian/rules
 #!/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