[Pkg-xfce-commits] r6290 - goodies/trunk/xfce4-genmon-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-01-02 21:03:03 +0000 (Mon, 02 Jan 2012)
New Revision: 6290

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

Modified: goodies/trunk/xfce4-genmon-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/changelog	2012-01-02 20:49:24 UTC (rev 6289)
+++ goodies/trunk/xfce4-genmon-plugin/debian/changelog	2012-01-02 21:03:03 UTC (rev 6290)
@@ -2,6 +2,12 @@
 
   * New upstream release.
     - fix plugin not refreshing before going to properties.     closes: #623697
+  * debian/rules:
+    - use hardening rules from dh9 and dpkg-dev 1.16.1.
+  * debian/compat bumped to 9
+  * debian/control:
+    - update debhelper build-dep for hardening support.
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 02 Jan 2012 21:32:35 +0100
 

Modified: goodies/trunk/xfce4-genmon-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/compat	2012-01-02 20:49:24 UTC (rev 6289)
+++ goodies/trunk/xfce4-genmon-plugin/debian/compat	2012-01-02 21:03:03 UTC (rev 6290)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-genmon-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/control	2012-01-02 20:49:24 UTC (rev 6289)
+++ goodies/trunk/xfce4-genmon-plugin/debian/control	2012-01-02 21:03:03 UTC (rev 6290)
@@ -4,8 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, xfce4-panel-dev (>= 4.8),
- libxml-parser-perl, libxfcegui4-dev (>= 4.8), intltool, hardening-includes
+Build-Depends: debhelper (>= 8.9.4), autotools-dev, xfce4-panel-dev (>= 4.8),
+ libxml-parser-perl, libxfcegui4-dev (>= 4.8), intltool, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-genmon-plugin/

Modified: goodies/trunk/xfce4-genmon-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/rules	2012-01-02 20:49:24 UTC (rev 6289)
+++ goodies/trunk/xfce4-genmon-plugin/debian/rules	2012-01-02 21:03:03 UTC (rev 6290)
@@ -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
-
 override_dh_install:
 	rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la