[Pkg-xfce-commits] r6520 - goodies/trunk/thunar-volman/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-03-30 19:47:24 +0000 (Fri, 30 Mar 2012)
New Revision: 6520

Modified:
   goodies/trunk/thunar-volman/debian/changelog
   goodies/trunk/thunar-volman/debian/compat
   goodies/trunk/thunar-volman/debian/control
   goodies/trunk/thunar-volman/debian/rules
Log:
upload

Modified: goodies/trunk/thunar-volman/debian/changelog
===================================================================
--- goodies/trunk/thunar-volman/debian/changelog	2012-03-29 10:58:55 UTC (rev 6519)
+++ goodies/trunk/thunar-volman/debian/changelog	2012-03-30 19:47:24 UTC (rev 6520)
@@ -1,11 +1,17 @@
-thunar-volman (0.6.1-1) UNRELEASED; urgency=low
+thunar-volman (0.6.1-1) unstable; urgency=low
 
   * New upstream release.
   * debian/watch updated since thunar-volman is now part of core Xfce.
   * debian/control:
     - update standards version to 3.9.3.
+    - update debhelper build-dep to 9 and add build-dep on dpkg-dev 1.16.1 for
+      hardening support.
+    - drop build-dep on hardening-includes.
+  * debian/compat bumped to 9.
+  * debian/rules:
+    - use debhelper 9 / dpkg-dev hardening support.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Mar 2012 12:45:12 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 30 Mar 2012 07:34:59 +0200
 
 thunar-volman (0.6.0-4) unstable; urgency=low
 

Modified: goodies/trunk/thunar-volman/debian/compat
===================================================================
--- goodies/trunk/thunar-volman/debian/compat	2012-03-29 10:58:55 UTC (rev 6519)
+++ goodies/trunk/thunar-volman/debian/compat	2012-03-30 19:47:24 UTC (rev 6520)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/thunar-volman/debian/control
===================================================================
--- goodies/trunk/thunar-volman/debian/control	2012-03-29 10:58:55 UTC (rev 6519)
+++ goodies/trunk/thunar-volman/debian/control	2012-03-30 19:47:24 UTC (rev 6520)
@@ -4,10 +4,10 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libexo-1-dev (>= 0.6.0),
+Build-Depends: debhelper (>= 9), libexo-1-dev (>= 0.6.0), dpkg-dev (>= 1.16.1),
  libgudev-1.0-dev (>= 145), libxfce4util-dev (>= 4.8.0), 
  libxfce4ui-1-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), libnotify-dev, 
- chrpath, libxml-parser-perl, intltool, hardening-includes
+ chrpath, libxml-parser-perl, intltool
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-volman/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-volman/

Modified: goodies/trunk/thunar-volman/debian/rules
===================================================================
--- goodies/trunk/thunar-volman/debian/rules	2012-03-29 10:58:55 UTC (rev 6519)
+++ goodies/trunk/thunar-volman/debian/rules	2012-03-30 19:47:24 UTC (rev 6520)
@@ -1,14 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-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)
-
-export CFLAGS LDFLAGS
-
 %:
 	dh $@