[Pkg-xfce-commits] r5715 - goodies/trunk/xfce4-wmdock-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-29 06:16:56 +0000 (Fri, 29 Apr 2011)
New Revision: 5715

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

Modified: goodies/trunk/xfce4-wmdock-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/changelog	2011-04-29 06:12:38 UTC (rev 5714)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/changelog	2011-04-29 06:16:56 UTC (rev 5715)
@@ -3,8 +3,14 @@
   * New upstream release.
   * debian/patches:
     - 01_port-xfce4-panel-47 dropped, included upstream.
+  * debian/rules:
+    - pick build flags from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to build flags.
+  * debian/control:
+    - add build-dep on hardening-includes.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:09:50 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:14:18 +0200
 
 xfce4-wmdock-plugin (0.3.2-2) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-wmdock-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/control	2011-04-29 06:12:38 UTC (rev 5714)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/control	2011-04-29 06:16:56 UTC (rev 5715)
@@ -6,7 +6,7 @@
  Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 6), autotools-dev, cdbs, xfce4-panel-dev,
- libwnck-dev, intltool, libxfcegui4-dev
+ libwnck-dev, intltool, libxfcegui4-dev, hardening-includes
 Standards-Version: 3.9.2
 Homepage: http://www.ibh.de/~ellguth/xfce4-wmdock-plugin.html
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-wmdock-plugin/

Modified: goodies/trunk/xfce4-wmdock-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/rules	2011-04-29 06:12:38 UTC (rev 5714)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/rules	2011-04-29 06:16:56 UTC (rev 5715)
@@ -1,3 +1,11 @@
 #!/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,-O1 -Wl,-z,defs -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS