[Pkg-xfce-commits] r4570 - goodies/trunk/xfce4-volumed/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-18 16:34:31 +0000 (Thu, 18 Nov 2010)
New Revision: 4570

Modified:
   goodies/trunk/xfce4-volumed/debian/changelog
   goodies/trunk/xfce4-volumed/debian/control
   goodies/trunk/xfce4-volumed/debian/rules
Log:
  - add build-dep on hardening-includes.
* debian/rules:
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add -O1, -z,defs and --as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/trunk/xfce4-volumed/debian/changelog
===================================================================
--- goodies/trunk/xfce4-volumed/debian/changelog	2010-11-18 16:31:51 UTC (rev 4569)
+++ goodies/trunk/xfce4-volumed/debian/changelog	2010-11-18 16:34:31 UTC (rev 4570)
@@ -3,9 +3,14 @@
   * New upstream release.
   * debian/control:
     - bump standards version to 3.9.1.
+    - add build-dep on hardening-includes.
   * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 18 Nov 2010 17:31:42 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 18 Nov 2010 17:33:51 +0100
 
 xfce4-volumed (0.1.8-1) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-volumed/debian/control
===================================================================
--- goodies/trunk/xfce4-volumed/debian/control	2010-11-18 16:31:51 UTC (rev 4569)
+++ goodies/trunk/xfce4-volumed/debian/control	2010-11-18 16:34:31 UTC (rev 4570)
@@ -5,7 +5,8 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
 Build-Depends: debhelper (>= 7), libexo-0.3-dev(>= 0.3.2), 
  libxfcegui4-dev (>= 4.4.0), libxfconf-0-dev, libgstreamer0.10-dev,
- libgstreamer-plugins-base0.10-dev, libxcb-keysyms1-dev, libnotify-dev
+ libgstreamer-plugins-base0.10-dev, libxcb-keysyms1-dev, libnotify-dev,
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/applications/xfce4-volumed
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-volumed/

Modified: goodies/trunk/xfce4-volumed/debian/rules
===================================================================
--- goodies/trunk/xfce4-volumed/debian/rules	2010-11-18 16:31:51 UTC (rev 4569)
+++ goodies/trunk/xfce4-volumed/debian/rules	2010-11-18 16:34:31 UTC (rev 4570)
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+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
+CFLAGS+=$(HARDENING_CFLAGS)
+
 %:
 	dh $@