[Pkg-xfce-commits] r5732 - goodies/trunk/xfce4-mpc-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-05-06 20:56:02 +0000 (Fri, 06 May 2011)
New Revision: 5732

Modified:
   goodies/trunk/xfce4-mpc-plugin/debian/changelog
   goodies/trunk/xfce4-mpc-plugin/debian/control
   goodies/trunk/xfce4-mpc-plugin/debian/rules
Log:
  - pick build flags from dpkg-buildflags.
  - add hardening flags to build flags.
  - add -O1, -z,defs and --as-needed to LDFLAGS.
  - add build-dep on hardening-includes.

Modified: goodies/trunk/xfce4-mpc-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/changelog	2011-05-06 20:53:25 UTC (rev 5731)
+++ goodies/trunk/xfce4-mpc-plugin/debian/changelog	2011-05-06 20:56:02 UTC (rev 5732)
@@ -6,12 +6,16 @@
   * debian/rules:
     - stop running xdt-autogen
     - switch to dh7 tiny rules
+    - pick build flags from dpkg-buildflags.
+    - add hardening flags to build flags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
   * debian/control:
     - drop cdbs from build-deps, update debhelper build-dep for overrides.
     - drop xfce4-dev-tools and libtool from build-deps.
+    - add build-dep on hardening-includes.
   * debian/docs added.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 06 May 2011 22:53:12 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 06 May 2011 22:53:49 +0200
 
 xfce4-mpc-plugin (0.3.5-2) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-mpc-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/control	2011-05-06 20:53:25 UTC (rev 5731)
+++ goodies/trunk/xfce4-mpc-plugin/debian/control	2011-05-06 20:56:02 UTC (rev 5732)
@@ -4,7 +4,7 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), xfce4-panel-dev (>= 4.8.0), libexo-1-dev,
- libxml-parser-perl, intltool, libxfcegui4-dev
+ libxml-parser-perl, intltool, libxfcegui4-dev, hardening-includes
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mpc-plugin/

Modified: goodies/trunk/xfce4-mpc-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-mpc-plugin/debian/rules	2011-05-06 20:53:25 UTC (rev 5731)
+++ goodies/trunk/xfce4-mpc-plugin/debian/rules	2011-05-06 20:56:02 UTC (rev 5732)
@@ -1,5 +1,13 @@
 #!/usr/bin/make -f
+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 $@