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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-05 11:45:10 +0000 (Fri, 05 Nov 2010)
New Revision: 4442

Modified:
   desktop/branches/experimental/thunar-vfs/debian/changelog
   desktop/branches/experimental/thunar-vfs/debian/control
   desktop/branches/experimental/thunar-vfs/debian/rules
   desktop/branches/experimental/thunar-vfs/debian/watch
Log:
* debian/control:
  - add build-dep on hardening-includes
* debian/rules:
  - pick {C,LD}FLAGS from dpkg-buildflags
  - add -O1, -z,defs, --as-needed to LDFLAGS
  - add hardening flags to {C,LD}FLAGS
* debian/watch updated to pick thunar-vfs instead of Thunar tarball.

Modified: desktop/branches/experimental/thunar-vfs/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/changelog	2010-11-05 11:17:33 UTC (rev 4441)
+++ desktop/branches/experimental/thunar-vfs/debian/changelog	2010-11-05 11:45:10 UTC (rev 4442)
@@ -1,5 +1,6 @@
 thunar-vfs (1.1.0-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * New upstream development release, split from thunar to allow goodies not
     ported to gio to still work.
   * Renamed source package to thunar-vfs, dropped thunar binary package,
@@ -25,6 +26,15 @@
     - debian/patches/07_update-cursor-on-delete.patch: dropped
     - debian/patches/08_refilter-tree-hidden-dir.patch: dropped.
 
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - add build-dep on hardening-includes
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags
+    - add -O1, -z,defs, --as-needed to LDFLAGS
+    - add hardening flags to {C,LD}FLAGS
+  * debian/watch updated to pick thunar-vfs instead of Thunar tarball.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 31 Oct 2010 22:58:31 +0100
 
 thunar-vfs (1.0.2-1) unstable; urgency=low

Modified: desktop/branches/experimental/thunar-vfs/debian/control
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/control	2010-11-05 11:17:33 UTC (rev 4441)
+++ desktop/branches/experimental/thunar-vfs/debian/control	2010-11-05 11:45:10 UTC (rev 4442)
@@ -6,9 +6,10 @@
  Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7), cdbs, libexo-1-dev (>= 0.5.4), libglib2.0-dev,
  libgtk2.0-dev (>= 2.10.1), libxfce4util-dev, libpng-dev, libdbus-glib-1-dev,
- libstartup-notification0-dev (>= 0.4), libjpeg-dev, intltool, libxml-parser-perl,
+ libstartup-notification0-dev (>= 0.4), libjpeg-dev, intltool, 
+ libxml-parser-perl, 
  libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libfam-dev,
- chrpath
+ chrpath, hardening-includes
 Build-Conflicts: libgamin-dev [!hurd-i386]
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar-vfs/

Modified: desktop/branches/experimental/thunar-vfs/debian/rules
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/rules	2010-11-05 11:17:33 UTC (rev 4441)
+++ desktop/branches/experimental/thunar-vfs/debian/rules	2010-11-05 11:45:10 UTC (rev 4442)
@@ -2,7 +2,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
+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)
+
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --disable-gnome-thumbnailers --enable-dbus --enable-startup-notification
 
 makebuilddir/libthunar-vfs-1-2:: debian/compat

Modified: desktop/branches/experimental/thunar-vfs/debian/watch
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/watch	2010-11-05 11:17:33 UTC (rev 4441)
+++ desktop/branches/experimental/thunar-vfs/debian/watch	2010-11-05 11:45:10 UTC (rev 4442)
@@ -1,3 +1,3 @@
 version=3
-http://www.xfce.org/archive/src/xfce/thunar/([\d\.]+)/ \
-  Thunar-([\d\.]+)\.tar\.(?:gz|bz2)
+http://www.xfce.org/archive/src/xfce/thunar-vfs/([\d\.]+)/ \
+  thunar-vfs-([\d\.]+)\.tar\.(?:gz|bz2)