[Pkg-xfce-commits] r6314 - goodies/trunk/xfce4-netload-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-01-13 16:15:14 +0000 (Fri, 13 Jan 2012)
New Revision: 6314

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

Modified: goodies/trunk/xfce4-netload-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/changelog	2012-01-13 12:15:05 UTC (rev 6313)
+++ goodies/trunk/xfce4-netload-plugin/debian/changelog	2012-01-13 16:15:14 UTC (rev 6314)
@@ -1,6 +1,13 @@
 xfce4-netload-plugin (1.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support
+  * debian/control:
+    - drop hardening-includes build-dep.
+    - update debhelper build-dep for hardening support.
+    - add dpkg-dev build-dep for hardening support.
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 13 Jan 2012 13:15:10 +0100
 

Modified: goodies/trunk/xfce4-netload-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/compat	2012-01-13 12:15:05 UTC (rev 6313)
+++ goodies/trunk/xfce4-netload-plugin/debian/compat	2012-01-13 16:15:14 UTC (rev 6314)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-netload-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/control	2012-01-13 12:15:05 UTC (rev 6313)
+++ goodies/trunk/xfce4-netload-plugin/debian/control	2012-01-13 16:15:14 UTC (rev 6314)
@@ -3,8 +3,9 @@
 Priority: optional
 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~), xfce4-panel-dev (>= 4.8.0), libxml2-dev,
- libxml-parser-perl, libxfcegui4-dev (>= 4.8.0), intltool, hardening-includes
+Build-Depends: debhelper (>= 8.9.4), xfce4-panel-dev (>= 4.8.0), libxml2-dev,
+ libxml-parser-perl, libxfcegui4-dev (>= 4.8.0), intltool, 
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-netload-plugin/

Modified: goodies/trunk/xfce4-netload-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/rules	2012-01-13 12:15:05 UTC (rev 6313)
+++ goodies/trunk/xfce4-netload-plugin/debian/rules	2012-01-13 16:15:14 UTC (rev 6314)
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+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 -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
 override_dh_auto_install:
 	-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.la