[Pkg-xfce-commits] r4584 - goodies/branches/experimental/xfce4-notifyd/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-27 14:19:14 +0000 (Sat, 27 Nov 2010)
New Revision: 4584

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

Modified: goodies/branches/experimental/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/changelog	2010-11-27 14:17:19 UTC (rev 4583)
+++ goodies/branches/experimental/xfce4-notifyd/debian/changelog	2010-11-27 14:19:14 UTC (rev 4584)
@@ -4,8 +4,13 @@
   * debian/control:
     - convert libxfcegui4-dev build-dep to libxfce4ui-dev.
     - update standards version to 3.9.1.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -z,defs, --as-needed and -O1 to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 27 Nov 2010 15:16:51 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 27 Nov 2010 15:18:28 +0100
 
 xfce4-notifyd (0.1.0-5) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-notifyd/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/control	2010-11-27 14:17:19 UTC (rev 4583)
+++ goodies/branches/experimental/xfce4-notifyd/debian/control	2010-11-27 14:19:14 UTC (rev 4584)
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 7.0.50~), intltool,
  libxfce4ui-dev, libxfce4util-dev (>= 4.6.0),
  libdbus-1-dev, libdbus-glib-1-dev, libglade2-dev, libsexy-dev,
- exo-utils, libxfconf-0-dev
+ exo-utils, libxfconf-0-dev, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://spuriousinterrupt.org/projects/xfce4-notifyd
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-notifyd/

Modified: goodies/branches/experimental/xfce4-notifyd/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/rules	2010-11-27 14:17:19 UTC (rev 4583)
+++ goodies/branches/experimental/xfce4-notifyd/debian/rules	2010-11-27 14:19:14 UTC (rev 4584)
@@ -1,6 +1,12 @@
 #!/usr/bin/make -f
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+include /usr/share/hardening-includes/hardening.make
+
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-maintainer-mode
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;