[Pkg-xfce-commits] r4321 - goodies/branches/experimental/xfce4-cpugraph-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-10-17 16:18:34 +0000 (Sun, 17 Oct 2010)
New Revision: 4321

Modified:
   goodies/branches/experimental/xfce4-cpugraph-plugin/debian/changelog
   goodies/branches/experimental/xfce4-cpugraph-plugin/debian/control
   goodies/branches/experimental/xfce4-cpugraph-plugin/debian/rules
Log:
  - add build-dep on hardening-includes.
* debian/rules:
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/branches/experimental/xfce4-cpugraph-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-cpugraph-plugin/debian/changelog	2010-10-17 15:33:08 UTC (rev 4320)
+++ goodies/branches/experimental/xfce4-cpugraph-plugin/debian/changelog	2010-10-17 16:18:34 UTC (rev 4321)
@@ -3,6 +3,11 @@
   [ Yves-Alexis Perez ]
   * debian/control:
     - switch to xfce section.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
 
   [ Lionel Le Folgoc ]
   * New upstream release.
@@ -16,7 +21,7 @@
     - bumped Standards-Version to 3.9.1.
   * debian/copyright: refreshed.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 09 Jan 2010 17:02:21 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 18:17:56 +0200
 
 xfce4-cpugraph-plugin (0.4.0-2) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-cpugraph-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-cpugraph-plugin/debian/control	2010-10-17 15:33:08 UTC (rev 4320)
+++ goodies/branches/experimental/xfce4-cpugraph-plugin/debian/control	2010-10-17 16:18:34 UTC (rev 4321)
@@ -4,7 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 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), libxfcegui4-dev, xfce4-panel-dev, intltool
+Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, intltool,
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-cpugraph-plugin/

Modified: goodies/branches/experimental/xfce4-cpugraph-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-cpugraph-plugin/debian/rules	2010-10-17 15:33:08 UTC (rev 4320)
+++ goodies/branches/experimental/xfce4-cpugraph-plugin/debian/rules	2010-10-17 16:18:34 UTC (rev 4321)
@@ -1,3 +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)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
+
 %:
 	dh $@