[Pkg-xfce-commits] r4552 - desktop/branches/experimental/orage/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-07 17:52:15 +0000 (Sun, 07 Nov 2010)
New Revision: 4552

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

Modified: desktop/branches/experimental/orage/debian/changelog
===================================================================
--- desktop/branches/experimental/orage/debian/changelog	2010-11-07 17:46:19 UTC (rev 4551)
+++ desktop/branches/experimental/orage/debian/changelog	2010-11-07 17:52:15 UTC (rev 4552)
@@ -5,11 +5,15 @@
     - update standards version to 3.9.1.
     - add build-dep on libical-dev and libpopt-dev.
     - add build-dep on xfce4-dev-tools and libtool.
+    - add build-dep on hardening-includes.
   * debian/watch updated to track upstream repository reorganization.
   * debian/rules:
     - update configure flags.
     - drop useless call to dh_desktop.
     - run xdt-autogen after applying patches.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
   * debian/patches
     - 01-dont-duplicate dropped.
     - 01_fix-build-with-external-ical added, update includes to correctly pick
@@ -18,7 +22,7 @@
   * debian/copyright updated to include complete text of BSD license.
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 18:42:04 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 18:46:43 +0100
 
 orage (4.6.1-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/orage/debian/control
===================================================================
--- desktop/branches/experimental/orage/debian/control	2010-11-07 17:46:19 UTC (rev 4551)
+++ desktop/branches/experimental/orage/debian/control	2010-11-07 17:52:15 UTC (rev 4552)
@@ -6,7 +6,8 @@
 Build-Depends: debhelper (>= 7), cdbs, libxml-parser-perl,
  libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.6.0), chrpath,
  libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool, 
- libdbus-1-dev, libical-dev, libpopt-dev, xfce4-dev-tools, libtool
+ libdbus-1-dev, libical-dev, libpopt-dev, xfce4-dev-tools, libtool,
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/

Modified: desktop/branches/experimental/orage/debian/rules
===================================================================
--- desktop/branches/experimental/orage/debian/rules	2010-11-07 17:46:19 UTC (rev 4551)
+++ desktop/branches/experimental/orage/debian/rules	2010-11-07 17:52:15 UTC (rev 4552)
@@ -2,9 +2,16 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+include /usr/share/hardening-includes/hardening.make
+
+
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-libical
-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)
+
 post-patches::
 	NOCONFIGURE=1 xdt-autogen