[Pkg-xfce-commits] r5688 - goodies/trunk/xfce4-dict/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-24 14:04:29 +0000 (Sun, 24 Apr 2011)
New Revision: 5688

Modified:
   goodies/trunk/xfce4-dict/debian/changelog
   goodies/trunk/xfce4-dict/debian/control
   goodies/trunk/xfce4-dict/debian/rules
Log:
* debian/rules:
  - pick build flags from dpkg-buildflags.
  - add hardening flags to build flags.
* debian/control:
  - add build-dep on hardening-includes.

Modified: goodies/trunk/xfce4-dict/debian/changelog
===================================================================
--- goodies/trunk/xfce4-dict/debian/changelog	2011-04-24 10:55:09 UTC (rev 5687)
+++ goodies/trunk/xfce4-dict/debian/changelog	2011-04-24 14:04:29 UTC (rev 5688)
@@ -1,3 +1,13 @@
+xfce4-dict (0.6.0-5) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - pick build flags from dpkg-buildflags.
+    - add hardening flags to build flags.
+  * debian/control:
+    - add build-dep on hardening-includes.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 24 Apr 2011 16:00:12 +0200
+
 xfce4-dict (0.6.0-4) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: goodies/trunk/xfce4-dict/debian/control
===================================================================
--- goodies/trunk/xfce4-dict/debian/control	2011-04-24 10:55:09 UTC (rev 5687)
+++ goodies/trunk/xfce4-dict/debian/control	2011-04-24 14:04:29 UTC (rev 5688)
@@ -4,7 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 7.0.13), xfce4-panel-dev (>= 4.8.0),
- libxml-parser-perl, intltool, libgtk2.0-dev, libxfcegui4-dev (>= 4.8.0)
+ libxml-parser-perl, intltool, libgtk2.0-dev, libxfcegui4-dev (>= 4.8.0),
+ hardening-includes
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-dict/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-dict/

Modified: goodies/trunk/xfce4-dict/debian/rules
===================================================================
--- goodies/trunk/xfce4-dict/debian/rules	2011-04-24 10:55:09 UTC (rev 5687)
+++ goodies/trunk/xfce4-dict/debian/rules	2011-04-24 14:04:29 UTC (rev 5688)
@@ -1,5 +1,12 @@
 #!/usr/bin/make -f
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+include /usr/share/hardening-includes/hardening.make
 
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
 %:
 	dh $@