[Pkg-xfce-commits] r4785 - goodies/branches/experimental/xfce4-battery-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-01-04 08:03:18 +0000 (Tue, 04 Jan 2011)
New Revision: 4785

Modified:
   goodies/branches/experimental/xfce4-battery-plugin/debian/changelog
   goodies/branches/experimental/xfce4-battery-plugin/debian/control
   goodies/branches/experimental/xfce4-battery-plugin/debian/rules
Log:
  - add build-dep on hardening-includes.
* debian/compat bumped to 7.0.50~ for overrides.
* debian/rules:
  - switch to tiny rules from dh 7.
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add hardening flags to {C,LD}FLAGS.
  - add -z,defs, -O1 and --as-needed to LDFLAGS.

Modified: goodies/branches/experimental/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-battery-plugin/debian/changelog	2011-01-04 07:51:46 UTC (rev 4784)
+++ goodies/branches/experimental/xfce4-battery-plugin/debian/changelog	2011-01-04 08:03:18 UTC (rev 4785)
@@ -12,14 +12,19 @@
     - use linux-any and kfreebsd-i386 architecture. 
     - add build-dep on intltool.
     - update debhelper build-dep to 7.
+    - add build-dep on hardening-includes.
   * Switch to 3.0 (quilt) source format.
-  * debian/compat bumped to 7.
+  * debian/compat bumped to 7.0.50~ for overrides.
   * debian/patches: 06_fix-ftbfs-2.6.24, 07_use-sysfs-fixed, 
       08_no-battery-display dropped, included upstream.
+  * debian/rules:
+    - switch to tiny rules from dh 7.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS.
+    - add -z,defs, -O1 and --as-needed to LDFLAGS.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 04 Jan 2011 09:03:00 +0100
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 04 Jan 2011 08:46:22 +0100
-
 xfce4-battery-plugin (0.5.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: goodies/branches/experimental/xfce4-battery-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-battery-plugin/debian/control	2011-01-04 07:51:46 UTC (rev 4784)
+++ goodies/branches/experimental/xfce4-battery-plugin/debian/control	2011-01-04 08:03:18 UTC (rev 4785)
@@ -3,9 +3,9 @@
 Priority: optional
 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>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 7), libgtk2.0-dev,
+Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~), libgtk2.0-dev,
   xfce4-panel-dev (>= 4.4.1), libxml2-dev, libxml-parser-perl,
-  libxfce4util-dev, libxfcegui4-dev, intltool
+  libxfce4util-dev, 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-battery-plugin/

Modified: goodies/branches/experimental/xfce4-battery-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-battery-plugin/debian/rules	2011-01-04 07:51:46 UTC (rev 4784)
+++ goodies/branches/experimental/xfce4-battery-plugin/debian/rules	2011-01-04 08:03:18 UTC (rev 4785)
@@ -1,7 +1,17 @@
 #!/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-battery-plugin::
-	-rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.la
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+override_dh_install:
+	rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.a
+	rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.la
+	dh_install
+
+%:
+	dh $@