[Pkg-xfce-commits] r4327 - desktop/branches/experimental/thunar/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-10-19 17:43:34 +0000 (Tue, 19 Oct 2010)
New Revision: 4327

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

Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog	2010-10-19 17:14:32 UTC (rev 4326)
+++ desktop/branches/experimental/thunar/debian/changelog	2010-10-19 17:43:34 UTC (rev 4327)
@@ -18,6 +18,7 @@
     - change thunarx libname to 2 in chrpath call.
     - rename lib dir from thunar to Thunar.
     - ignore thunarx plugins in dh_makeshlibs.
+    - add hardening flags to {C,LD}FLAGS.
   * debian/patches:
     - 01_thunar-help-directory dropped, not useful anymore.
     - 02_thunar-icon-naming-spec-compliance refreshed.
@@ -38,6 +39,7 @@
       dropped.
     - add recommends on tumbler.
     - temporarily drop xfce4-panel build-dep until we have a stable situation.
+    - add build-dep on hardening-includes.
   * drop libthunar-vfs maintainer scripts and lintian overrides.
   * debian/watch updated.
   * debian/thunar.install:
@@ -73,7 +75,7 @@
   * debian/libthunarx-2-0.symbols: added.
   * debian/libthunarx-2-0.shlib: dropped.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 19 Oct 2010 18:46:31 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 19 Oct 2010 19:15:56 +0200
 
 thunar (1.0.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control	2010-10-19 17:14:32 UTC (rev 4326)
+++ desktop/branches/experimental/thunar/debian/control	2010-10-19 17:43:34 UTC (rev 4327)
@@ -8,7 +8,8 @@
  libfam-dev, libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
  chrpath, libpcre3-dev, libjpeg-dev,
  libstartup-notification0-dev (>= 0.4), intltool, libxfce4ui-1-dev (>= 4.7.1),
- libnotify-dev, libgudev-1.0-dev [linux-any], xfce4-dev-tools, libtool, gtk-doc-tools
+ libnotify-dev, libgudev-1.0-dev [linux-any], xfce4-dev-tools, libtool, 
+ gtk-doc-tools, hardening-includes
 Build-Conflicts: libgamin-dev [!hurd-i386]
 Standards-Version: 3.9.1
 Homepage: http://thunar.xfce.org

Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules	2010-10-19 17:14:32 UTC (rev 4326)
+++ desktop/branches/experimental/thunar/debian/rules	2010-10-19 17:43:34 UTC (rev 4327)
@@ -1,8 +1,12 @@
 #!/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,-O1 -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS)
 
 %:
 	dh $@