[Pkg-xfce-commits] r4412 - goodies/branches/experimental/xfce4-indicator-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 22:32:01 +0000 (Thu, 04 Nov 2010)
New Revision: 4412

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

Modified: goodies/branches/experimental/xfce4-indicator-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-indicator-plugin/debian/changelog	2010-11-04 22:27:47 UTC (rev 4411)
+++ goodies/branches/experimental/xfce4-indicator-plugin/debian/changelog	2010-11-04 22:32:01 UTC (rev 4412)
@@ -1,3 +1,14 @@
+xfce4-indicator-plugin (0.0.1-3) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add build-dep on hardening-includes
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add -O1, --as-needed and -z,defs to LDFLAGS
+    - add hardening flags to {C,LD}FLAGS
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 23:31:15 +0100
+
 xfce4-indicator-plugin (0.0.1-2) unstable; urgency=low
 
   * debian/control:

Modified: goodies/branches/experimental/xfce4-indicator-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-indicator-plugin/debian/control	2010-11-04 22:27:47 UTC (rev 4411)
+++ goodies/branches/experimental/xfce4-indicator-plugin/debian/control	2010-11-04 22:32:01 UTC (rev 4412)
@@ -5,8 +5,8 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
  Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, libindicator-dev (>=0.3.0),
- intltool
+Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, 
+ libindicator-dev (>=0.3.0), intltool, hardening-includes
 Standards-Version: 3.8.4
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/

Modified: goodies/branches/experimental/xfce4-indicator-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-indicator-plugin/debian/rules	2010-11-04 22:27:47 UTC (rev 4411)
+++ goodies/branches/experimental/xfce4-indicator-plugin/debian/rules	2010-11-04 22:32:01 UTC (rev 4412)
@@ -1,9 +1,11 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+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)
 
 %:
 	dh  $@