[Pkg-xfce-commits] r5032 - desktop/branches/experimental/xfce4-mixer/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-02-25 20:48:28 +0000 (Fri, 25 Feb 2011)
New Revision: 5032

Modified:
   desktop/branches/experimental/xfce4-mixer/debian/changelog
   desktop/branches/experimental/xfce4-mixer/debian/control
   desktop/branches/experimental/xfce4-mixer/debian/rules
Log:
  - add -O1, -z,defs and --as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.
  - add build-dep on hardening-includes.

Modified: desktop/branches/experimental/xfce4-mixer/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-mixer/debian/changelog	2011-02-25 20:45:18 UTC (rev 5031)
+++ desktop/branches/experimental/xfce4-mixer/debian/changelog	2011-02-25 20:48:28 UTC (rev 5032)
@@ -9,12 +9,15 @@
   * debian/rules:
     - drop all references to quilt
     - call dpkg-buildflags for CFLAGS and LDFLAGS.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
   * debian/control:
     - drop quilt build-dep
     - update standards version to 3.9.1
     - update debhelper build-dep to 7.0.50~ because of overrides. 
+    - add build-dep on hardening-includes.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 25 Feb 2011 21:44:59 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 25 Feb 2011 21:47:07 +0100
 
 xfce4-mixer (4.6.1-2) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-mixer/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-mixer/debian/control	2011-02-25 20:45:18 UTC (rev 5031)
+++ desktop/branches/experimental/xfce4-mixer/debian/control	2011-02-25 20:48:28 UTC (rev 5032)
@@ -7,7 +7,7 @@
  libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, 
  libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), 
  xfce4-panel-dev (>= 4.6.0), libxml-parser-perl, 
- libxfconf-0-dev (>= 4.6.0), intltool
+ libxfconf-0-dev (>= 4.6.0), intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/

Modified: desktop/branches/experimental/xfce4-mixer/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-mixer/debian/rules	2011-02-25 20:45:18 UTC (rev 5031)
+++ desktop/branches/experimental/xfce4-mixer/debian/rules	2011-02-25 20:48:28 UTC (rev 5032)
@@ -1,9 +1,14 @@
 #!/usr/bin/make -f
 
+include /usr/share/hardening-includes/hardening.make
+
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
+export CFLAGS LDFLAGS
+
 %:
 	dh $@