[pkg-java] r18326 - trunk/java-gnome/debian

[Guillaume Mazoyer]

Author: gmazoyer-guest
Date: 2014-08-27 07:46:45 +0000 (Wed, 27 Aug 2014)
New Revision: 18326

Modified:
   trunk/java-gnome/debian/changelog
   trunk/java-gnome/debian/compat
   trunk/java-gnome/debian/control
   trunk/java-gnome/debian/rules
Log:
java-gnome: set CFLAGS and LDFLAGS variables to debian standards and use verbose build.

Modified: trunk/java-gnome/debian/changelog
===================================================================
--- trunk/java-gnome/debian/changelog	2014-08-26 23:16:45 UTC (rev 18325)
+++ trunk/java-gnome/debian/changelog	2014-08-27 07:46:45 UTC (rev 18326)
@@ -1,3 +1,13 @@
+java-gnome (4.1.3-3) 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, 27 Aug 2014 09:43:26 +0200
+
 java-gnome (4.1.3-2) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/java-gnome/debian/compat
===================================================================
--- trunk/java-gnome/debian/compat	2014-08-26 23:16:45 UTC (rev 18325)
+++ trunk/java-gnome/debian/compat	2014-08-27 07:46:45 UTC (rev 18326)
@@ -1 +1 @@
-5
+9

Modified: trunk/java-gnome/debian/control
===================================================================
--- trunk/java-gnome/debian/control	2014-08-26 23:16:45 UTC (rev 18325)
+++ trunk/java-gnome/debian/control	2014-08-27 07:46:45 UTC (rev 18326)
@@ -5,7 +5,7 @@
            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,

Modified: trunk/java-gnome/debian/rules
===================================================================
--- trunk/java-gnome/debian/rules	2014-08-26 23:16:45 UTC (rev 18325)
+++ trunk/java-gnome/debian/rules	2014-08-27 07:46:45 UTC (rev 18326)
@@ -1,12 +1,11 @@
 #!/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
 
 ifneq (,$(filter $(DEB_HOST_ARCH), i386 amd64 powerpc))
@@ -14,8 +13,7 @@
 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: