[Pkg-xfce-commits] r4416 - desktop/branches/experimental/exo/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 23:01:37 +0000 (Thu, 04 Nov 2010)
New Revision: 4416

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

Modified: desktop/branches/experimental/exo/debian/changelog
===================================================================
--- desktop/branches/experimental/exo/debian/changelog	2010-11-04 22:45:35 UTC (rev 4415)
+++ desktop/branches/experimental/exo/debian/changelog	2010-11-04 23:01:37 UTC (rev 4416)
@@ -7,6 +7,7 @@
     - get *FLAGS from dpkg-buildflags.
     - don't pass libexecdir, not used anymore
     - correct exo-helper path in chrpath call
+    - add hardening flags to {C,LD}FLAGS
   * debian/control:
     - change binary packages name to match updated soname.
     - use proper relation in conflict.
@@ -14,6 +15,7 @@
     - add build-dep on libxfce4util-dev.
     - add dep on ${misc:Depends} for libexo-1-dev.
     - update standards version to 3.9.1.
+    - add build-dep on hardening-includes
   * debian/libexo-common.{preinst,postinst,prerm}:
     - use dpkg-maintscript-helper to remove /etc/xdg/xfce4/mount.rc.
   * debian/libexo-0-1.install:
@@ -57,7 +59,7 @@
   * Bugs fixed by 0.5.x/0.6.x series:
     - FTBFS with binutils-gold                                  Closes: #554276
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 13:44:57 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 23:33:55 +0100
 
 exo (0.3.106-2) unstable; urgency=low
 

Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control	2010-11-04 22:45:35 UTC (rev 4415)
+++ desktop/branches/experimental/exo/debian/control	2010-11-04 23:01:37 UTC (rev 4416)
@@ -6,7 +6,7 @@
  Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev, 
- libxfce4ui-1-dev (>= 4.7.0), liburi-perl, chrpath, intltool
+ libxfce4ui-1-dev (>= 4.7.0), liburi-perl, chrpath, intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/

Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules	2010-11-04 22:45:35 UTC (rev 4415)
+++ desktop/branches/experimental/exo/debian/rules	2010-11-04 23:01:37 UTC (rev 4416)
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/hardening-includes/hardening.make
+
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
 
+
 EXO_LIBNAME=1
 EXO_SOVERSION=0
 EXO_SONAME=libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION)