[Pkg-xfce-commits] r4430 - desktop/branches/experimental/xfce4-settings/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 08:44:09 +0000 (Fri, 05 Nov 2010)
New Revision: 4430

Modified:
   desktop/branches/experimental/xfce4-settings/debian/changelog
   desktop/branches/experimental/xfce4-settings/debian/control
   desktop/branches/experimental/xfce4-settings/debian/rules
Log:
  - add build-dep on hardening-includes
* debian/rules:
  - add hardening flags to {C,LD}FLAGS.

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/changelog	2010-11-05 08:42:02 UTC (rev 4429)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	2010-11-05 08:44:09 UTC (rev 4430)
@@ -10,6 +10,9 @@
     - switch libxfcegui4 build-dep to libxfce4ui.
     - build-conflicts with libxfcegui4-dev to be sure to pick kbd headers from
       libxfce4ui-dev.
+    - add build-dep on hardening-includes
+  * debian/rules:
+    - add hardening flags to {C,LD}FLAGS.
 
   [ Lionel Le Folgoc ]
   * debian/control:
@@ -19,7 +22,7 @@
     - call dpkg-buildflags
     - link with --as-needed.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 10:24:32 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 09:40:31 +0100
 
 xfce4-settings (4.6.4-2) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-settings/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/control	2010-11-05 08:42:02 UTC (rev 4429)
+++ desktop/branches/experimental/xfce4-settings/debian/control	2010-11-05 08:44:09 UTC (rev 4430)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0),
  libxfce4ui-1-dev (>= 4.7.0), libexo-1-dev (>= 0.5.0),
  libxfconf-0-dev, libwnck-dev, libxklavier-dev (>= 5.0), libnotify-dev,
- intltool (>= 0.31)
+ intltool (>= 0.31), hardening-includes
 Build-Conflicts: libxfcegui4-dev
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org

Modified: desktop/branches/experimental/xfce4-settings/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/rules	2010-11-05 08:42:02 UTC (rev 4429)
+++ desktop/branches/experimental/xfce4-settings/debian/rules	2010-11-05 08:44:09 UTC (rev 4430)
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/hardening-includes/hardening.make
+
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
+
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-libnotify --enable-xcursor \
 		--enable-libxklavier --enable-xsettings-daemon --enable-sound-settings\