[Pkg-xfce-commits] r5679 - goodies/trunk/parole/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-23 15:22:16 +0000 (Sat, 23 Apr 2011)
New Revision: 5679

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

Modified: goodies/trunk/parole/debian/changelog
===================================================================
--- goodies/trunk/parole/debian/changelog	2011-04-23 15:21:42 UTC (rev 5678)
+++ goodies/trunk/parole/debian/changelog	2011-04-23 15:22:16 UTC (rev 5679)
@@ -17,10 +17,14 @@
     - update standards version to 3.9.2.
     - drop browser-plugin-parole package.
     - drop quilt build-dep.
+    - add build-dep on hardening-includes
   * debian/parole.install updated.
   * debian/rules:
     - use --fail-missing and manually remove spurious files.
     - drop quilt addon
+    - pick build flags from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to build flags.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 23 Apr 2011 17:04:06 +0200
 

Modified: goodies/trunk/parole/debian/control
===================================================================
--- goodies/trunk/parole/debian/control	2011-04-23 15:21:42 UTC (rev 5678)
+++ goodies/trunk/parole/debian/control	2011-04-23 15:22:16 UTC (rev 5679)
@@ -7,7 +7,8 @@
 Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config, 
  libgtk2.0-dev (>= 2.16), libgstreamer0.10-dev, 
  libgstreamer-plugins-base0.10-dev, libdbus-1-dev, libdbus-glib-1-dev,
- libxfcegui4-dev (>= 4.6.0), libnotify-dev, libtagc0-dev
+ libxfcegui4-dev (>= 4.6.0), libnotify-dev, libtagc0-dev,
+ hardening-includes
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/applications/parole
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/parole/

Modified: goodies/trunk/parole/debian/rules
===================================================================
--- goodies/trunk/parole/debian/rules	2011-04-23 15:21:42 UTC (rev 5678)
+++ goodies/trunk/parole/debian/rules	2011-04-23 15:22:16 UTC (rev 5679)
@@ -1,9 +1,18 @@
 #!/usr/bin/make -f
 #LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+include /usr/share/hardening-includes/hardening.make
 
 export SHELL=/bin/bash
 export CONFIG_SHELL=/bin/bash
 
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS)
+
+export CFLAGS LDFLAGS
+
 %:
 	dh $@