[Pkg-xfce-commits] r4823 - goodies/branches/experimental/xfce4-diskperf-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-01-21 14:57:47 +0000 (Fri, 21 Jan 2011)
New Revision: 4823

Modified:
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/control
   goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules
Log:
  - update debhelper build-dep to 7.0.50~ for overrides.
  - switch to dh7 tiny rules.
  - pick {C,LD}FLAGS from dpkg-buildflags.
	- add hardening flags to {C,LD}FLAGS.
  - add -z,defs, --as-needed and -O1 to LFDLAGS.

Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog	2011-01-21 14:38:51 UTC (rev 4822)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog	2011-01-21 14:57:47 UTC (rev 4823)
@@ -6,18 +6,20 @@
     - add build-dep on libxfcegui4-dev now that it's gone from
       xfce4-panel-dev dependencies.
     - update standards version to 3.9.1.
-    - add build-dep on xfce4-dev-tools because of the patch 
-      touching configure.in.
+    - update debhelper build-dep to 7.0.50~ for overrides.
     - switch to linux-any architectures.                        closes: #604681
   * Switch to 3.0 (quilt) source format.
   * debian/rules:
-    - run xdt-autogen after patching.
+    - switch to dh7 tiny rules.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+  	- add hardening flags to {C,LD}FLAGS.
+    - add -z,defs, --as-needed and -O1 to LFDLAGS.
 
   [ Lionel Le Folgoc ]
   * debian/rules: clean up autogenerated files changed by xdt-autogen.
   * debian/control: add myself to Uploaders.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 21 Jan 2011 15:09:01 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 21 Jan 2011 15:42:35 +0100
 
 xfce4-diskperf-plugin (2.2.0-3) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/control	2011-01-21 14:38:51 UTC (rev 4822)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/control	2011-01-21 14:57:47 UTC (rev 4823)
@@ -5,9 +5,9 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 7), xfce4-panel-dev, 
- libxml2-dev, libxml-parser-perl, libxfcegui4-dev, xfce4-dev-tools, intltool,
- libtool
+Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~), xfce4-panel-dev, 
+ libxml2-dev, libxml-parser-perl, libxfcegui4-dev, intltool,
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-diskperf-plugin/

Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules	2011-01-21 14:38:51 UTC (rev 4822)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules	2011-01-21 14:57:47 UTC (rev 4823)
@@ -1,7 +1,15 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
-binary-post-install/xfce4-diskperf-plugin::
+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)
+
+%:
+	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
+	dh_auto_install