[Pkg-xfce-commits] r4434 - desktop/branches/experimental/xfce4-appfinder/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 09:52:17 +0000 (Fri, 05 Nov 2010)
New Revision: 4434

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

Modified: desktop/branches/experimental/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-appfinder/debian/changelog	2010-11-05 09:04:59 UTC (rev 4433)
+++ desktop/branches/experimental/xfce4-appfinder/debian/changelog	2010-11-05 09:52:17 UTC (rev 4434)
@@ -6,15 +6,17 @@
     - refresh build-deps for Xfce 4.7.
     - update standards version to 3.9.1
     - add build-dep on libgarcon-1-0-dev.
+    - add build-dep on hardening-includes.
   * Switch to 3.0 (quilt) source format.
   * debian/rules:
     - build with --as-needed.
+    - add hardening flags to {C,LD}FLAGS
 
   [ Lionel Le Folgoc ]
   * debian/control: drop build-deps on libxfce4menu-0.1-dev (ported to garcon)
     and libthunar-vfs-1-dev (ported to gio).
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 16:04:32 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 10:05:18 +0100
 
 xfce4-appfinder (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-appfinder/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-appfinder/debian/control	2010-11-05 09:04:59 UTC (rev 4433)
+++ desktop/branches/experimental/xfce4-appfinder/debian/control	2010-11-05 09:52:17 UTC (rev 4434)
@@ -5,8 +5,8 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libxfce4ui-1-dev (>= 4.7.0), libxft-dev,
- libxml-parser-perl, libgtk2.0-dev, libxfconf-0-dev, libgarcon-1-0-dev (>= 0.1.0),
- intltool
+ libxml-parser-perl, libgtk2.0-dev, libxfconf-0-dev, 
+ libgarcon-1-0-dev (>= 0.1.0), intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/

Modified: desktop/branches/experimental/xfce4-appfinder/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-appfinder/debian/rules	2010-11-05 09:04:59 UTC (rev 4433)
+++ desktop/branches/experimental/xfce4-appfinder/debian/rules	2010-11-05 09:52:17 UTC (rev 4434)
@@ -1,9 +1,12 @@
 #!/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_install:
 	# install menu pixmap
 	install -d $(CURDIR)/debian/xfce4-appfinder/usr/share/pixmaps