[Pkg-xfce-commits] r4439 - desktop/branches/experimental/libxfcegui4/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 10:08:20 +0000 (Fri, 05 Nov 2010)
New Revision: 4439

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

Modified: desktop/branches/experimental/libxfcegui4/debian/changelog
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/changelog	2010-11-05 10:03:12 UTC (rev 4438)
+++ desktop/branches/experimental/libxfcegui4/debian/changelog	2010-11-05 10:08:20 UTC (rev 4439)
@@ -8,8 +8,13 @@
     - drop xfce-keyboard-shortcut package, now provided by libxfce4ui.
   * debian/control:
     - update standards version to 3.9.1.
+    - add build-dep on hardening-includes. 
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add -O1, -z,defs, --as-needed to LDFLAGS
+    - add hardening flags to {C,LD}FLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 03 Nov 2010 15:15:34 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 11:01:40 +0100
 
 libxfcegui4 (4.6.4-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/libxfcegui4/debian/control
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/control	2010-11-05 10:03:12 UTC (rev 4438)
+++ desktop/branches/experimental/libxfcegui4/debian/control	2010-11-05 10:08:20 UTC (rev 4439)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6), 
  libxfce4util-dev (>= 4.6.0), libxfconf-0-dev (>=4.6.0),
  libstartup-notification0-dev, libglade2-dev, 
- libgladeui-1-dev, intltool
+ libgladeui-1-dev, intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/

Modified: desktop/branches/experimental/libxfcegui4/debian/rules
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/rules	2010-11-05 10:03:12 UTC (rev 4438)
+++ desktop/branches/experimental/libxfcegui4/debian/rules	2010-11-05 10:08:20 UTC (rev 4439)
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
 
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+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)
 
+
 %:
 	dh $@