[Pkg-xfce-commits] r4325 - goodies/branches/experimental/xfce4-datetime-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-10-17 21:05:34 +0000 (Sun, 17 Oct 2010)
New Revision: 4325

Modified:
   goodies/branches/experimental/xfce4-datetime-plugin/debian/changelog
   goodies/branches/experimental/xfce4-datetime-plugin/debian/control
   goodies/branches/experimental/xfce4-datetime-plugin/debian/rules
Log:
  - add build-dep on hardening-includes
  - 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-datetime-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-datetime-plugin/debian/changelog	2010-10-17 20:48:21 UTC (rev 4324)
+++ goodies/branches/experimental/xfce4-datetime-plugin/debian/changelog	2010-10-17 21:05:34 UTC (rev 4325)
@@ -9,11 +9,15 @@
     - switch to xfce section.
     - update standards version to 3.9.1.
     - update debhelper build dep to 7.0.50~ for overrides.
+    - add build-dep on hardening-includes
   * debian/rules:
     - switch to dh7 rules with overrides.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
   * debian/compat switched to 7.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 22:41:34 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 22:48:50 +0200
 
 xfce4-datetime-plugin (0.6.1-1) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-datetime-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-datetime-plugin/debian/control	2010-10-17 20:48:21 UTC (rev 4324)
+++ goodies/branches/experimental/xfce4-datetime-plugin/debian/control	2010-10-17 21:05:34 UTC (rev 4325)
@@ -6,7 +6,7 @@
  Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: autotools-dev, intltool, cdbs, debhelper (>= 7.0.50~),
  libgtk2.0-dev, libxfcegui4-dev (>= 4.4.0), xfce4-panel-dev (>= 4.4.0),
- libxml2-dev, libxml-parser-perl
+ libxml2-dev, libxml-parser-perl, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-datetime-plugin/

Modified: goodies/branches/experimental/xfce4-datetime-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-datetime-plugin/debian/rules	2010-10-17 20:48:21 UTC (rev 4324)
+++ goodies/branches/experimental/xfce4-datetime-plugin/debian/rules	2010-10-17 21:05:34 UTC (rev 4325)
@@ -1,5 +1,12 @@
 #!/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 $@