[Pkg-xfce-commits] r6219 - goodies/trunk/squeeze/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-11-18 13:38:45 +0000 (Fri, 18 Nov 2011)
New Revision: 6219

Modified:
   goodies/trunk/squeeze/debian/changelog
   goodies/trunk/squeeze/debian/compat
   goodies/trunk/squeeze/debian/control
   goodies/trunk/squeeze/debian/rules
Log:
* debian/rules:
  - use dh 9 and dpkg-dev 1.16.1 hardening support
* debian/control:
  - update debhelper build-dep for v9 hardening support.
  - add build-dep on dpkg-dev 1.16.1 for hardening support.
  - drop build-dep on hardening-wrapper.
* debian/compat bumped to 9.

Modified: goodies/trunk/squeeze/debian/changelog
===================================================================
--- goodies/trunk/squeeze/debian/changelog	2011-11-18 12:02:44 UTC (rev 6218)
+++ goodies/trunk/squeeze/debian/changelog	2011-11-18 13:38:45 UTC (rev 6219)
@@ -3,6 +3,13 @@
   * debian/patches:
     - 03_fix_segfault_on_relative_paths added, thanks to Ibragimov Rinat.
       Correctly handle path with '/' in them.          closes: #607483, #608005
+  * debian/rules:
+    - use dh 9 and dpkg-dev 1.16.1 hardening support
+  * debian/control:
+    - update debhelper build-dep for v9 hardening support.
+    - add build-dep on dpkg-dev 1.16.1 for hardening support.
+    - drop build-dep on hardening-wrapper.
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 18 Nov 2011 12:58:09 +0100
 

Modified: goodies/trunk/squeeze/debian/compat
===================================================================
--- goodies/trunk/squeeze/debian/compat	2011-11-18 12:02:44 UTC (rev 6218)
+++ goodies/trunk/squeeze/debian/compat	2011-11-18 13:38:45 UTC (rev 6219)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/squeeze/debian/control
===================================================================
--- goodies/trunk/squeeze/debian/control	2011-11-18 12:02:44 UTC (rev 6218)
+++ goodies/trunk/squeeze/debian/control	2011-11-18 13:38:45 UTC (rev 6219)
@@ -4,9 +4,9 @@
 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.5.0),
- libthunar-vfs-1-dev (>= 0.4.0), libdbus-glib-1-dev (>= 0.34), libgtk2.0-dev,
- hardening-wrapper
+Build-Depends: debhelper (>= 8.9.4), dpkg-dev (>= 1.16.1), 
+ libexo-1-dev (>= 0.5.0),
+ libthunar-vfs-1-dev (>= 0.4.0), libdbus-glib-1-dev (>= 0.34), libgtk2.0-dev
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/squeeze/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/squeeze/

Modified: goodies/trunk/squeeze/debian/rules
===================================================================
--- goodies/trunk/squeeze/debian/rules	2011-11-18 12:02:44 UTC (rev 6218)
+++ goodies/trunk/squeeze/debian/rules	2011-11-18 13:38:45 UTC (rev 6219)
@@ -1,12 +1,8 @@
 #!/usr/bin/make -f
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-export DEB_BUILD_HARDENING=1                                                    
-
 override_dh_install:
 	dh_install
 	install -D -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/squeeze/usr/share/lintian/overrides/squeeze