[Pkg-xfce-commits] r6430 - desktop/trunk/exo/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-02-19 16:34:04 +0000 (Sun, 19 Feb 2012)
New Revision: 6430

Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/control
   desktop/trunk/exo/debian/rules
Log:
* debian/rules:
  - use debhelper 9 hardening support.
* debian/control:
  - update debhelper build-dep to 9.
  - drop build-dep on hardening-includes.
  - add build-dep on dpkg-dev 1.16.1 for hardening support.

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2012-02-19 16:31:42 UTC (rev 6429)
+++ desktop/trunk/exo/debian/changelog	2012-02-19 16:34:04 UTC (rev 6430)
@@ -1,11 +1,20 @@
 exo (0.6.2-4) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * Use maintscript support in dh_installdeb rather than writing out
     dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a
     new enough version of dpkg rather than using 'dpkg-maintscript-helper
     supports' guards, leading to more predictable behaviour on upgrades.
     Thanks Colin Watson for the patch.                          Closes: #659901
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use debhelper 9 hardening support.
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - drop build-dep on hardening-includes.
+    - add build-dep on dpkg-dev 1.16.1 for hardening support.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 16 Feb 2012 22:43:45 +0100
 
 exo (0.6.2-3) unstable; urgency=low

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2012-02-19 16:31:42 UTC (rev 6429)
+++ desktop/trunk/exo/debian/control	2012-02-19 16:34:04 UTC (rev 6430)
@@ -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 (>= 8.1.3), libxfce4util-dev (>= 4.8.0), 
+Build-Depends: debhelper (>= 9), libxfce4util-dev (>= 4.8.0), 
  libxfce4ui-1-dev (>= 4.8.0), liburi-perl, chrpath, intltool, 
- hardening-includes, libglib2.0-dev (>= 2.27),
+ dpkg-dev (>= 1.16.1), libglib2.0-dev (>= 2.27),
  xfce4-dev-tools, libtool, gtk-doc-tools
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org

Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules	2012-02-19 16:31:42 UTC (rev 6429)
+++ desktop/trunk/exo/debian/rules	2012-02-19 16:34:04 UTC (rev 6430)
@@ -1,16 +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
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 EXO_LIBNAME=1
 EXO_SOVERSION=0
 EXO_SONAME=libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION)