[Pkg-xfce-commits] r4414 - desktop/branches/experimental/libxfce4util/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 22:40:42 +0000 (Thu, 04 Nov 2010)
New Revision: 4414

Modified:
   desktop/branches/experimental/libxfce4util/debian/changelog
   desktop/branches/experimental/libxfce4util/debian/control
   desktop/branches/experimental/libxfce4util/debian/rules
Log:
* debian/rules:
  - add hardening flags to {C,LD}FLAGS
* debian/control:
  - add build-dep on hardening-includes

Modified: desktop/branches/experimental/libxfce4util/debian/changelog
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/changelog	2010-11-04 22:32:34 UTC (rev 4413)
+++ desktop/branches/experimental/libxfce4util/debian/changelog	2010-11-04 22:40:42 UTC (rev 4414)
@@ -3,6 +3,10 @@
   [ Yves-Alexis Perez ]
   * New upstream development release.
   * debian/libxfce4util.shlibs: bump package version to 4.7.0.
+  * debian/rules:
+    - add hardening flags to {C,LD}FLAGS
+  * debian/control:
+    - add build-dep on hardening-includes
 
   [ Lionel Le Folgoc ]
   * debian/libxfce4util4.symbols: added.
@@ -17,7 +21,7 @@
   * debian/copyright: refreshed.
   * debian/README.source: dropped.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 09 Jan 2010 20:19:25 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 23:36:34 +0100
 
 libxfce4util (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/libxfce4util/debian/control
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/control	2010-11-04 22:32:34 UTC (rev 4413)
+++ desktop/branches/experimental/libxfce4util/debian/control	2010-11-04 22:40:42 UTC (rev 4414)
@@ -4,7 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, intltool
+Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, intltool, 
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfce4util/

Modified: desktop/branches/experimental/libxfce4util/debian/rules
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/rules	2010-11-04 22:32:34 UTC (rev 4413)
+++ desktop/branches/experimental/libxfce4util/debian/rules	2010-11-04 22:40:42 UTC (rev 4414)
@@ -1,8 +1,11 @@
 #!/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)
 
 override_dh_install:
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4util.la