[Pkg-xfce-commits] r6112 - desktop/trunk/xfwm4/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-11 12:10:31 +0000 (Tue, 11 Oct 2011)
New Revision: 6112

Modified:
   desktop/trunk/xfwm4/debian/changelog
   desktop/trunk/xfwm4/debian/compat
   desktop/trunk/xfwm4/debian/control
   desktop/trunk/xfwm4/debian/rules
Log:
* debian/rules:
  - use dpkg-dev hardening support
* debian/control:
  - update dpkg-dev and debhelper build-dep for hardening support
* debian/compat bumped to 9 for hardening support.

Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog	2011-10-11 12:03:57 UTC (rev 6111)
+++ desktop/trunk/xfwm4/debian/changelog	2011-10-11 12:10:31 UTC (rev 6112)
@@ -8,6 +8,11 @@
   * debian/patches:
     - 0001-Do-not-enforce-the-size-increment-only-if-the-size-r added,
       cherry-picked from upstream.
+  * debian/rules:
+    - use dpkg-dev hardening support
+  * debian/control:
+    - update dpkg-dev and debhelper build-dep for hardening support
+  * debian/compat bumped to 9 for hardening support.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 22 Sep 2011 21:34:26 +0200
 

Modified: desktop/trunk/xfwm4/debian/compat
===================================================================
--- desktop/trunk/xfwm4/debian/compat	2011-10-11 12:03:57 UTC (rev 6111)
+++ desktop/trunk/xfwm4/debian/compat	2011-10-11 12:10:31 UTC (rev 6112)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfwm4/debian/control
===================================================================
--- desktop/trunk/xfwm4/debian/control	2011-10-11 12:03:57 UTC (rev 6111)
+++ desktop/trunk/xfwm4/debian/control	2011-10-11 12:10:31 UTC (rev 6112)
@@ -4,7 +4,8 @@
 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~), libgtk2.0-dev (>= 2.10.6),
+Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 8.9.4), 
+ libgtk2.0-dev (>= 2.10.6),
  libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
  libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.8.0),
  libxfce4ui-1-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), libwnck-dev, intltool,

Modified: desktop/trunk/xfwm4/debian/rules
===================================================================
--- desktop/trunk/xfwm4/debian/rules	2011-10-11 12:03:57 UTC (rev 6111)
+++ desktop/trunk/xfwm4/debian/rules	2011-10-11 12:10:31 UTC (rev 6112)
@@ -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_strip:
 	dh_strip --dbg-package=xfwm4-dbg