[Pkg-xfce-commits] r6166 - desktop/trunk/xfce4-utils/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-24 20:48:14 +0000 (Mon, 24 Oct 2011)
New Revision: 6166

Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/compat
   desktop/trunk/xfce4-utils/debian/control
   desktop/trunk/xfce4-utils/debian/rules
Log:
* debian/rules:
  - use hardening support from dh 9 and dpkg-dev 1.16.1.
* debian/compat bumped to 9.
* debian/control:
  - update debhelper build-dep to 8.9.4 for hardening support.
  - add build-dep on dpkg-dev 1.16.1 for hardening support.
  - drop build-dep on hardening-includes.

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2011-10-24 17:07:04 UTC (rev 6165)
+++ desktop/trunk/xfce4-utils/debian/changelog	2011-10-24 20:48:14 UTC (rev 6166)
@@ -1,12 +1,22 @@
 xfce4-utils (4.8.3-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * New upstream release, including updated translations.
   * debian/xfce4-utils.1: fix path to upstream docs.            Closes: #638205
   * debian/patches/01_xflock4-test-running-screensaver.patch: use pgrep -f for
     gnome-screensaver, as the binary name is longer than 15c.   Closes: #642551
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 22 Sep 2011 21:28:03 +0200
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use hardening support from dh 9 and dpkg-dev 1.16.1.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - update debhelper build-dep to 8.9.4 for hardening support.
+    - add build-dep on dpkg-dev 1.16.1 for hardening support.
+    - drop build-dep on hardening-includes.
 
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 24 Oct 2011 22:47:58 +0200
+
 xfce4-utils (4.8.2-3) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/trunk/xfce4-utils/debian/compat
===================================================================
--- desktop/trunk/xfce4-utils/debian/compat	2011-10-24 17:07:04 UTC (rev 6165)
+++ desktop/trunk/xfce4-utils/debian/compat	2011-10-24 20:48:14 UTC (rev 6166)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control	2011-10-24 17:07:04 UTC (rev 6165)
+++ desktop/trunk/xfce4-utils/debian/control	2011-10-24 20:48:14 UTC (rev 6166)
@@ -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~), libxfce4util-dev (>= 4.8.0),
- libxfce4ui-1-dev (>= 4.8.0), chrpath, intltool, 
- libgtk2.0-dev (>= 2.10.0), hardening-includes, libdbus-glib-1-dev (>= 0.33),
+Build-Depends: debhelper (>= 8.9.4), libxfce4util-dev (>= 4.8.0), 
+ dpkg-dev (>= 1.16.1), libxfce4ui-1-dev (>= 4.8.0), chrpath, intltool, 
+ libgtk2.0-dev (>= 2.10.0), libdbus-glib-1-dev (>= 0.33),
  xfce4-dev-tools, libtool
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2011-10-24 17:07:04 UTC (rev 6165)
+++ desktop/trunk/xfce4-utils/debian/rules	2011-10-24 20:48:14 UTC (rev 6166)
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
 
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 export PWD=$(shell pwd)
 
-include /usr/share/hardening-includes/hardening.make
-
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
 XFVENDOR=Debian
 ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
 	XFVENDOR=Xubuntu