[Pkg-xfce-commits] r5046 - goodies/branches/experimental/thunar-volman/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-02-27 00:24:00 +0000 (Sun, 27 Feb 2011)
New Revision: 5046

Modified:
   goodies/branches/experimental/thunar-volman/debian/changelog
   goodies/branches/experimental/thunar-volman/debian/control
   goodies/branches/experimental/thunar-volman/debian/rules
Log:
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add -W1, z,defs and --as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/branches/experimental/thunar-volman/debian/changelog
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/changelog	2011-02-27 00:20:21 UTC (rev 5045)
+++ goodies/branches/experimental/thunar-volman/debian/changelog	2011-02-27 00:24:00 UTC (rev 5046)
@@ -24,8 +24,11 @@
   * debian/rules:
     - install a thunar-volman.xml config file to disabled automount, autorun
       and autobrowse by default.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -W1, z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 17 Jan 2011 12:58:41 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 01:23:08 +0100
 
 thunar-volman (0.3.80-4) unstable; urgency=low
 

Modified: goodies/branches/experimental/thunar-volman/debian/control
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/control	2011-02-27 00:20:21 UTC (rev 5045)
+++ goodies/branches/experimental/thunar-volman/debian/control	2011-02-27 00:24:00 UTC (rev 5046)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 7.0.50~), libexo-1-dev (>= 0.6.0),
  libgudev-1.0-dev (>= 145), libxfce4ui-1-dev (>= 4.8.0), 
  libxfconf-0-dev (>= 4.8.0), libnotify-dev, chrpath, libxml-parser-perl,
- intltool
+ intltool, hardening-includes
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-volman/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-volman/

Modified: goodies/branches/experimental/thunar-volman/debian/rules
===================================================================
--- goodies/branches/experimental/thunar-volman/debian/rules	2011-02-27 00:20:21 UTC (rev 5045)
+++ goodies/branches/experimental/thunar-volman/debian/rules	2011-02-27 00:24:00 UTC (rev 5046)
@@ -1,12 +1,14 @@
 #!/usr/bin/make -f
 
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+include /usr/share/hardening-includes/hardening.make
 
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
 %:
 	dh $@