[Pkg-xfce-commits] r4419 - desktop/branches/experimental/xfdesktop4/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 08:06:51 +0000 (Fri, 05 Nov 2010)
New Revision: 4419

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

Modified: desktop/branches/experimental/xfdesktop4/debian/changelog
===================================================================
--- desktop/branches/experimental/xfdesktop4/debian/changelog	2010-11-05 07:48:19 UTC (rev 4418)
+++ desktop/branches/experimental/xfdesktop4/debian/changelog	2010-11-05 08:06:51 UTC (rev 4419)
@@ -7,6 +7,7 @@
     - refresh build-deps for Xfce 4.7.
     - add build dep on libxfce4ui-1-dev.
     - drop xfce4-panel build-dep since we don't build any plugin anymore.
+    - add build-dep on hardening-includes.
   * Switch to 3.0 (quilt) source format.
   * debian/rules:
     - pick {C,LD}FLAGS from dpkg-buildflags.
@@ -14,6 +15,7 @@
     - drop usr/lib from chrpath call, it doesn't exist anymore.
     - don't rename generic terminal .desktop file, it's gone too.
     - pass docdir to configure.
+    - add hardening flags to {C,LD}FLAGS
   * debian/xfdesktop4-data.install:
     - drop usr/share/desktop-directories from install file.
   * debian/xfdesktop4.install:
@@ -24,7 +26,7 @@
   * debian/control: clean up build-deps since xfdesktop has been ported to gio,
     exo-1 and garcon.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 17:44:44 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 09:00:53 +0100
 
 xfdesktop4 (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfdesktop4/debian/control
===================================================================
--- desktop/branches/experimental/xfdesktop4/debian/control	2010-11-05 07:48:19 UTC (rev 4418)
+++ desktop/branches/experimental/xfdesktop4/debian/control	2010-11-05 08:06:51 UTC (rev 4419)
@@ -7,7 +7,8 @@
 Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev (>= 2.18.0),
  libgtk2.0-dev (>= 2.14.0), libxfce4ui-1-dev (>= 4.7.0), libwnck-dev (>= 2.12),
  libxfconf-0-dev, intltool, libdbus-glib-1-dev, libthunarx-2-dev (>= 1.1.3),
- libexo-1-dev, libgarcon-1-0-dev (>= 0.1.2), libnotify-dev, chrpath
+ libexo-1-dev, libgarcon-1-0-dev (>= 0.1.2), libnotify-dev, chrpath,
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/

Modified: desktop/branches/experimental/xfdesktop4/debian/rules
===================================================================
--- desktop/branches/experimental/xfdesktop4/debian/rules	2010-11-05 07:48:19 UTC (rev 4418)
+++ desktop/branches/experimental/xfdesktop4/debian/rules	2010-11-05 08:06:51 UTC (rev 4419)
@@ -1,8 +1,11 @@
 #!/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-thunarx --enable-exo \