[Pkg-xfce-commits] r6609 - goodies/trunk/xfce4-diskperf-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-03 15:05:15 +0000 (Tue, 03 Apr 2012)
New Revision: 6609

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

Modified: goodies/trunk/xfce4-diskperf-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-diskperf-plugin/debian/changelog	2012-04-03 15:03:08 UTC (rev 6608)
+++ goodies/trunk/xfce4-diskperf-plugin/debian/changelog	2012-04-03 15:05:15 UTC (rev 6609)
@@ -1,6 +1,14 @@
 xfce4-diskperf-plugin (2.4.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+    - use multiarch paths.
+  * debian/control:
+    - drop build-dep on hardening-includes.
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 03 Apr 2012 17:02:52 +0200
 

Modified: goodies/trunk/xfce4-diskperf-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-diskperf-plugin/debian/compat	2012-04-03 15:03:08 UTC (rev 6608)
+++ goodies/trunk/xfce4-diskperf-plugin/debian/compat	2012-04-03 15:05:15 UTC (rev 6609)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-diskperf-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-diskperf-plugin/debian/control	2012-04-03 15:03:08 UTC (rev 6608)
+++ goodies/trunk/xfce4-diskperf-plugin/debian/control	2012-04-03 15:05:15 UTC (rev 6609)
@@ -4,9 +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: autotools-dev, debhelper (>= 7.0.50~), 
+Build-Depends: autotools-dev, debhelper (>= 9), 
  xfce4-panel-dev (>= 4.8.0), libxfcegui4-dev (>= 4.8.0), 
- libxml2-dev, libxml-parser-perl, intltool, hardening-includes
+ libxml2-dev, libxml-parser-perl, 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-diskperf-plugin/

Modified: goodies/trunk/xfce4-diskperf-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-diskperf-plugin/debian/rules	2012-04-03 15:03:08 UTC (rev 6608)
+++ goodies/trunk/xfce4-diskperf-plugin/debian/rules	2012-04-03 15:05:15 UTC (rev 6609)
@@ -1,17 +1,12 @@
 #!/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,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@
 
 override_dh_auto_install:
-	-rm -rf debian/xfce4-diskperf-plugin/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/xfce4-diskperf-plugin/usr/lib/xfce4/panel-plugins/*.la
+	-rm -rf debian/xfce4-diskperf-plugin/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.a
+	-rm -rf debian/xfce4-diskperf-plugin/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.la
 	dh_auto_install