[Pkg-xfce-commits] r4484 - goodies/branches/experimental/xfce4-weather-plugin/debian

Yves-Alexis Perez corsac at alioth.debian.org
Sat Nov 6 02:28:47 UTC 2010


Author: corsac
Date: 2010-11-06 02:28:47 +0000 (Sat, 06 Nov 2010)
New Revision: 4484

Modified:
   goodies/branches/experimental/xfce4-weather-plugin/debian/changelog
   goodies/branches/experimental/xfce4-weather-plugin/debian/control
   goodies/branches/experimental/xfce4-weather-plugin/debian/rules
Log:
  - add build-dep on hardening-includes.
* debian/rules:
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add -O1, -z,defs and --as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/branches/experimental/xfce4-weather-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/changelog	2010-11-06 02:21:46 UTC (rev 4483)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/changelog	2010-11-06 02:28:47 UTC (rev 4484)
@@ -3,9 +3,14 @@
   * debian/control:
     - add build dep on libxfcegui4-dev.
     - update standards version to 3.9.1.
+    - add build-dep on hardening-includes.
   * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 03:21:33 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 03:25:13 +0100
 
 xfce4-weather-plugin (0.7.3-2) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-weather-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/control	2010-11-06 02:21:46 UTC (rev 4483)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/control	2010-11-06 02:28:47 UTC (rev 4484)
@@ -4,7 +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>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0), 
- xfce4-panel-dev, libxml2-dev, libxml-parser-perl, intltool, libxfcegui4-dev
+ xfce4-panel-dev, libxml2-dev, libxml-parser-perl, intltool, libxfcegui4-dev,
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-weather-plugin/

Modified: goodies/branches/experimental/xfce4-weather-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/rules	2010-11-06 02:21:46 UTC (rev 4483)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/rules	2010-11-06 02:28:47 UTC (rev 4484)
@@ -6,8 +6,14 @@
 # (see below for the dirty hack)
 
 include /usr/share/cdbs/1/class/autotools.mk
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
+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)
+
 binary-post-install/xfce4-weather-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la




More information about the Pkg-xfce-commits mailing list