[Pkg-xfce-commits] r6174 - desktop/trunk/xfce4-settings/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-27 19:31:37 +0000 (Thu, 27 Oct 2011)
New Revision: 6174

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

Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog	2011-10-26 20:42:22 UTC (rev 6173)
+++ desktop/trunk/xfce4-settings/debian/changelog	2011-10-27 19:31:37 UTC (rev 6174)
@@ -1,8 +1,18 @@
 xfce4-settings (4.8.3-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * New upstream release.
   * debian/watch: only consider stable releases.
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use dpkg-dev 1.16.1 and debhelper 9 hardening support
+  * debian/control:
+    - drop hardening-includes build-dep.
+    - update debhelper build-dep to 8.9.4 for dpkg-buildflags support
+    - add dpkg-dev 1.16.1 build-dep for hardening support
+  * debian/compat bumped to 9.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 18 Aug 2011 13:13:35 +0200
 
 xfce4-settings (4.8.2-2) unstable; urgency=low

Modified: desktop/trunk/xfce4-settings/debian/compat
===================================================================
--- desktop/trunk/xfce4-settings/debian/compat	2011-10-26 20:42:22 UTC (rev 6173)
+++ desktop/trunk/xfce4-settings/debian/compat	2011-10-27 19:31:37 UTC (rev 6174)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfce4-settings/debian/control
===================================================================
--- desktop/trunk/xfce4-settings/debian/control	2011-10-26 20:42:22 UTC (rev 6173)
+++ desktop/trunk/xfce4-settings/debian/control	2011-10-27 19:31:37 UTC (rev 6174)
@@ -4,10 +4,11 @@
 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),
+Build-Depends: debhelper (>= 8.9.4), dpkg-dev (>= 1.16.1),
+  libxfce4util-dev (>= 4.8.0),
  libxfce4ui-1-dev (>= 4.8.0), libexo-1-dev (>= 0.6.0),
  libxfconf-0-dev (>= 4.8.0), libwnck-dev, libxklavier-dev (>= 5.0), 
- libnotify-dev, intltool (>= 0.31), hardening-includes
+ libnotify-dev, intltool (>= 0.31)
 Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org

Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules	2011-10-26 20:42:22 UTC (rev 6173)
+++ desktop/trunk/xfce4-settings/debian/rules	2011-10-27 19:31:37 UTC (rev 6174)
@@ -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
 
-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
-
 override_dh_auto_configure:
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
 	dh_auto_configure -- --enable-libnotify --enable-xcursor \