[Pkg-xfce-commits] r5151 - goodies/branches/experimental/xfce4-genmon-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-23 15:52:45 +0000 (Wed, 23 Mar 2011)
New Revision: 5151

Modified:
   goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
   goodies/branches/experimental/xfce4-genmon-plugin/debian/control
   goodies/branches/experimental/xfce4-genmon-plugin/debian/rules
Log:
  - add build-dep on hardening-includes.
  - pick build flags from dpkg-buildflags.
  - add -z,defs, --as-needed and -O1 to LDFLAGS.
  - add hardening flags to build flags.

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:41:43 UTC (rev 5150)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:52:45 UTC (rev 5151)
@@ -12,11 +12,15 @@
     - update standards version to 3.9.1.
     - add ${misc:Depends} to dependencies.
     - update debhelper build-dep to follow compat level.
+    - add build-dep on hardening-includes.
   * debian/patches:
     - 01_no-zombies dropped, included upstream.
     - 02_close-unused-pipes as well.
   * debian/rules:
     - drop simple-patchsys include.
+    - pick build flags from dpkg-buildflags.
+    - add -z,defs, --as-needed and -O1 to LDFLAGS.
+    - add hardening flags to build flags.
   * Switch to 3.0 (quilt) source format
   * debian/compat bumped to 7.
 

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/control	2011-03-23 15:41:43 UTC (rev 5150)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/control	2011-03-23 15:52:45 UTC (rev 5151)
@@ -5,7 +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), autotools-dev, cdbs, 
- xfce4-panel-dev (>= 4.4.1), libxml-parser-perl, libxfcegui4-dev, intltool
+ xfce4-panel-dev (>= 4.4.1), libxml-parser-perl, libxfcegui4-dev, intltool,
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-genmon-plugin/

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/rules	2011-03-23 15:41:43 UTC (rev 5150)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/rules	2011-03-23 15:52:45 UTC (rev 5151)
@@ -1,7 +1,15 @@
 #!/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)
+
+export CFLAGS LDFLAGS
+
 binary-post-install/xfce4-genmon-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la