[Pkg-xfce-commits] r4524 - goodies/branches/experimental/xfce4-notes-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-07 09:41:40 +0000 (Sun, 07 Nov 2010)
New Revision: 4524

Modified:
   goodies/branches/experimental/xfce4-notes-plugin/debian/changelog
   goodies/branches/experimental/xfce4-notes-plugin/debian/control
   goodies/branches/experimental/xfce4-notes-plugin/debian/rules
Log:
* debian/rules:
  - 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-notes-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-notes-plugin/debian/changelog	2010-11-07 09:26:11 UTC (rev 4523)
+++ goodies/branches/experimental/xfce4-notes-plugin/debian/changelog	2010-11-07 09:41:40 UTC (rev 4524)
@@ -3,8 +3,12 @@
   * debian/control:
     - update standards version to 3.9.1.
   * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 10:21:00 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 10:27:08 +0100
 
 xfce4-notes-plugin (1.7.6-1) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-notes-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-notes-plugin/debian/control	2010-11-07 09:26:11 UTC (rev 4523)
+++ goodies/branches/experimental/xfce4-notes-plugin/debian/control	2010-11-07 09:41:40 UTC (rev 4524)
@@ -5,7 +5,7 @@
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~),
  xfce4-panel-dev (>= 4.4.1), libxml2-dev, libxml-parser-perl, intltool,
  libx11-dev, pkg-config, libgtk2.0-dev, libxfcegui4-dev, libxfconf-0-dev,
- libunique-dev
+ libunique-dev, hardening-includes
 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>
 Standards-Version: 3.9.1

Modified: goodies/branches/experimental/xfce4-notes-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-notes-plugin/debian/rules	2010-11-07 09:26:11 UTC (rev 4523)
+++ goodies/branches/experimental/xfce4-notes-plugin/debian/rules	2010-11-07 09:41:40 UTC (rev 4524)
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
 
-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)
 
 override_dh_install:
 	-rm -rf debian/tmp/usr/lib/xfce4/panel-plugins/*.a