[Pkg-xfce-commits] r5277 - in goodies/trunk/xfswitch-plugin: . debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-02 19:40:55 +0000 (Sat, 02 Apr 2011)
New Revision: 5277

Modified:
   goodies/trunk/xfswitch-plugin/
   goodies/trunk/xfswitch-plugin/debian/changelog
   goodies/trunk/xfswitch-plugin/debian/control
   goodies/trunk/xfswitch-plugin/debian/rules
Log:
merge experimental branch into trunk



Property changes on: goodies/trunk/xfswitch-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfswitch-plugin:4419-5276

Modified: goodies/trunk/xfswitch-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfswitch-plugin/debian/changelog	2011-04-02 19:33:01 UTC (rev 5276)
+++ goodies/trunk/xfswitch-plugin/debian/changelog	2011-04-02 19:40:55 UTC (rev 5277)
@@ -1,4 +1,4 @@
-xfswitch-plugin (0.0.1-2) unstable; urgency=low
+xfswitch-plugin (0.0.1-2) UNRELEASED; urgency=low
 
   [ Evgeni Golov ]
   * Fix Vcs-* fields, they were missing 'trunk' in the path.
@@ -7,9 +7,14 @@
   * debian/watch edited to track Xfce archive reorganisation. 
   * debian/control:
     - switch to xfce section.
-    - add alternative depend on gdm3.
+    - add build-dep on libxfcegui4-dev. 
+    - update standards version to 3.9.1.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs, --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 10 Dec 2010 20:29:22 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 17:28:47 +0100
 
 xfswitch-plugin (0.0.1-1) unstable; urgency=low
 

Modified: goodies/trunk/xfswitch-plugin/debian/control
===================================================================
--- goodies/trunk/xfswitch-plugin/debian/control	2011-04-02 19:33:01 UTC (rev 5276)
+++ goodies/trunk/xfswitch-plugin/debian/control	2011-04-02 19:40:55 UTC (rev 5277)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
-Build-Depends: debhelper (>= 7), autotools-dev, intltool, xfce4-panel-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), autotools-dev, intltool, xfce4-panel-dev,
+ libxfcegui4-dev, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfswitch-plugin
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfswitch-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfswitch-plugin/

Modified: goodies/trunk/xfswitch-plugin/debian/rules
===================================================================
--- goodies/trunk/xfswitch-plugin/debian/rules	2011-04-02 19:33:01 UTC (rev 5276)
+++ goodies/trunk/xfswitch-plugin/debian/rules	2011-04-02 19:40:55 UTC (rev 5277)
@@ -1,3 +1,13 @@
 #!/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 CFLAGS LDFLAGS
+
 %:
 	dh $@