[Pkg-xfce-commits] r4264 - desktop/branches/experimental/xfce4-utils/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-09-05 14:13:38 +0000 (Sun, 05 Sep 2010)
New Revision: 4264

Modified:
   desktop/branches/experimental/xfce4-utils/debian/changelog
   desktop/branches/experimental/xfce4-utils/debian/rules
Log:
* debian/rules:
  - pick {C,LD}FLAGS from dpkg-buildflags.

Modified: desktop/branches/experimental/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/changelog	2010-09-05 14:13:21 UTC (rev 4263)
+++ desktop/branches/experimental/xfce4-utils/debian/changelog	2010-09-05 14:13:38 UTC (rev 4264)
@@ -8,8 +8,10 @@
     - 01_xflock4-test-running-screensaver refreshed.
     - 02_use-Xsessions.options-for-ssh-agent-handling dropped, Xfce has an
       internal parameter so it can now be disabled there.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 15:11:46 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 16:11:55 +0200
 
 xfce4-utils (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-utils/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/rules	2010-09-05 14:13:21 UTC (rev 4263)
+++ desktop/branches/experimental/xfce4-utils/debian/rules	2010-09-05 14:13:38 UTC (rev 4264)
@@ -2,15 +2,9 @@
 
 export PWD=$(shell pwd)
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- --with-vendor-info=Debian --with-x \