[java-gnome] 01/01: Update rules to use verbose mode and standards CFLAGS/LDFLAGS.

[Guillaume Mazoyer]

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

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

commit 374dbc07c2df73b3b6aba647278639fa61bc37c6
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date:   Wed Sep 10 18:29:13 2014 +0200

    Update rules to use verbose mode and standards CFLAGS/LDFLAGS.
---
 debian/changelog | 10 ++++++++++
 debian/compat    |  2 +-
 debian/control   |  2 +-
 debian/rules     |  6 ++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d0bddb..ddd0799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+java-gnome (4.1.3-4) UNRELEASED; urgency=medium
+
+  * debian/rules
+    - Set CFLAGS and LDFLAGS variables according to the Debian standards.
+    - Add -ffunction-sections to CFLAGS for hppa.
+    - Set V=1 to build in verbose mode so the compiler flags are not hidden.
+  * Properly use debhelper 9.
+
+ -- Guillaume Mazoyer <respawneral at gmail.com>  Wed, 10 Sep 2014 18:14:48 +0200
+
 java-gnome (4.1.3-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 983dc7d..d8b8f6a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Manu Mahajan <manu at codepencil.com>,
            Onkar Shinde <onkarshinde at ubuntu.com>,
            Guillaume Mazoyer <respawneral at gmail.com>
 Build-Depends: cdbs,
-               debhelper (>= 9),
+               debhelper (>= 9~),
                default-jdk,
                hicolor-icon-theme,
                junit,
diff --git a/debian/rules b/debian/rules
index c9b1aa9..7e421eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@ 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
@@ -16,8 +19,7 @@ DEB_MAKE_ENVVARS += DISPLAY=":99"
 DEB_MAKE_BUILD_TARGET += doc
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH), hppa))
-DEB_MAKE_ENVVARS += V=1
-CFLAGS += -ffunction-sections
+DEB_MAKE_ENVVARS += CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -ffunction-sections"
 endif
 
 get-orig-source:

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