[Pkg-xfce-commits] r6162 - goodies/trunk/xfce4-xkb-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-24 16:51:00 +0000 (Mon, 24 Oct 2011)
New Revision: 6162

Modified:
   goodies/trunk/xfce4-xkb-plugin/debian/changelog
   goodies/trunk/xfce4-xkb-plugin/debian/compat
   goodies/trunk/xfce4-xkb-plugin/debian/control
   goodies/trunk/xfce4-xkb-plugin/debian/rules
Log:
* debian/rules:
  - use hardening support from dh 9 and dpkg-dev 1.16.1.
* 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.
* debian/compat bumped to 9.

Modified: goodies/trunk/xfce4-xkb-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/changelog	2011-10-24 16:46:03 UTC (rev 6161)
+++ goodies/trunk/xfce4-xkb-plugin/debian/changelog	2011-10-24 16:51:00 UTC (rev 6162)
@@ -1,7 +1,17 @@
 xfce4-xkb-plugin (0.5.4.2-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * New upstream release.
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use hardening support from dh 9 and dpkg-dev 1.16.1.
+  * 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.
+  * debian/compat bumped to 9.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 15 Oct 2011 16:52:47 +0200
 
 xfce4-xkb-plugin (0.5.4.1-1) unstable; urgency=low

Modified: goodies/trunk/xfce4-xkb-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/compat	2011-10-24 16:46:03 UTC (rev 6161)
+++ goodies/trunk/xfce4-xkb-plugin/debian/compat	2011-10-24 16:51:00 UTC (rev 6162)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-xkb-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/control	2011-10-24 16:46:03 UTC (rev 6161)
+++ goodies/trunk/xfce4-xkb-plugin/debian/control	2011-10-24 16:51:00 UTC (rev 6162)
@@ -4,10 +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~), libgtk2.0-dev,
+Build-Depends: debhelper (>= 8.9.4), libgtk2.0-dev, dpkg-dev (>= 1.16.1),
   libxfce4ui-1-dev (>= 4.8.0), xfce4-panel-dev (>= 4.8.0), libxml-parser-perl,
-  libxklavier-dev (>= 5.0), librsvg2-dev, libwnck-dev, intltool,
-  hardening-includes
+  libxklavier-dev (>= 5.0), librsvg2-dev, libwnck-dev, intltool
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/

Modified: goodies/trunk/xfce4-xkb-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/rules	2011-10-24 16:46:03 UTC (rev 6161)
+++ goodies/trunk/xfce4-xkb-plugin/debian/rules	2011-10-24 16:51:00 UTC (rev 6162)
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
+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 $@