[Pkg-xfce-commits] r6180 - goodies/trunk/xfburn/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-28 14:16:58 +0000 (Fri, 28 Oct 2011)
New Revision: 6180

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

Modified: goodies/trunk/xfburn/debian/changelog
===================================================================
--- goodies/trunk/xfburn/debian/changelog	2011-10-28 09:12:14 UTC (rev 6179)
+++ goodies/trunk/xfburn/debian/changelog	2011-10-28 14:16:58 UTC (rev 6180)
@@ -1,5 +1,6 @@
 xfburn (0.4.3-4) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * debian/patches:
     - xfburn-gio.patch: port from thunar-vfs/hal to gio/udev
     - xfburn-ui.patch: port to libxfce4ui.
@@ -11,6 +12,15 @@
     - run xdt-autogen before ./configure script
     - clean up autogenerated file after build.
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support
+  * debian/control:
+    - drop hardening-includes build-dep
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
+    - update debhelper build-dep for hardening support.
+  * debian/compat bumped to 9.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 26 Oct 2011 21:52:43 +0200
 
 xfburn (0.4.3-3) unstable; urgency=low

Modified: goodies/trunk/xfburn/debian/compat
===================================================================
--- goodies/trunk/xfburn/debian/compat	2011-10-28 09:12:14 UTC (rev 6179)
+++ goodies/trunk/xfburn/debian/compat	2011-10-28 14:16:58 UTC (rev 6180)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfburn/debian/control
===================================================================
--- goodies/trunk/xfburn/debian/control	2011-10-28 09:12:14 UTC (rev 6179)
+++ goodies/trunk/xfburn/debian/control	2011-10-28 14:16:58 UTC (rev 6180)
@@ -4,11 +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~), libxfce4ui-1-dev (>= 4.8.0),
+Build-Depends: debhelper (>= 8.9.4), libxfce4ui-1-dev (>= 4.8.0),
  libexo-1-dev (>= 0.6.0), libburn-dev, libisofs-dev, libdbus-glib-1-dev,
  libgstreamer0.10-dev, intltool, libgstreamer-plugins-base0.10-dev,
  libgudev-1.0-dev [linux-any], xfce4-dev-tools, automake, autoconf, libtool,
- hardening-includes
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfburn/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfburn/

Modified: goodies/trunk/xfburn/debian/rules
===================================================================
--- goodies/trunk/xfburn/debian/rules	2011-10-28 09:12:14 UTC (rev 6179)
+++ goodies/trunk/xfburn/debian/rules	2011-10-28 14:16:58 UTC (rev 6180)
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 $(HARDENING_LDFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@