[Pkg-xfce-commits] r4506 - goodies/branches/experimental/xfce4-verve-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-06 11:32:26 +0000 (Sat, 06 Nov 2010)
New Revision: 4506

Modified:
   goodies/branches/experimental/xfce4-verve-plugin/debian/changelog
   goodies/branches/experimental/xfce4-verve-plugin/debian/control
   goodies/branches/experimental/xfce4-verve-plugin/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: goodies/branches/experimental/xfce4-verve-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-verve-plugin/debian/changelog	2010-11-06 11:11:12 UTC (rev 4505)
+++ goodies/branches/experimental/xfce4-verve-plugin/debian/changelog	2010-11-06 11:32:26 UTC (rev 4506)
@@ -9,13 +9,17 @@
     - switch to xfce section.
     - add build-dep on libxfcegui4-dev. 
     - add build-dep on xfce4-dev-tools and libtool
+    - add build-dep on hardening-includes.
   * debian/patches:
     - 01_add-47-panel-support added, add support for Xfce 4.7.
   * debian/rules:
     - run xdt-autogen after applying patch touching configure.in/Makefile.am
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 11:53:29 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 12:12:38 +0100
 
 xfce4-verve-plugin (0.3.6-1) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-verve-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-verve-plugin/debian/control	2010-11-06 11:11:12 UTC (rev 4505)
+++ goodies/branches/experimental/xfce4-verve-plugin/debian/control	2010-11-06 11:32:26 UTC (rev 4506)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 4.1.0), autotools-dev, cdbs, 
  libexo-0.3-dev (>= 0.3.2-3), xfce4-panel-dev (>= 4.4.1), libpcre3-dev, 
  libstartup-notification0-dev, libxml-parser-perl, libdbus-glib-1-dev,
- intltool, libxfcegui4-dev, xfce4-dev-tools, libtool
+ intltool, libxfcegui4-dev, xfce4-dev-tools, libtool, hardening-includes
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-verve-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-verve-plugin/

Modified: goodies/branches/experimental/xfce4-verve-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-verve-plugin/debian/rules	2010-11-06 11:11:12 UTC (rev 4505)
+++ goodies/branches/experimental/xfce4-verve-plugin/debian/rules	2010-11-06 11:32:26 UTC (rev 4506)
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
+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)
+
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
 
 DEB_INSTALL_MANPAGES_xfce4-verve-plugin := debian/verve-focus.1