[Pkg-xfce-commits] r5288 - in goodies/trunk/xfce4-mount-plugin: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-02 21:25:06 +0000 (Sat, 02 Apr 2011)
New Revision: 5288

Added:
   goodies/trunk/xfce4-mount-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-mount-plugin/
   goodies/trunk/xfce4-mount-plugin/debian/changelog
   goodies/trunk/xfce4-mount-plugin/debian/compat
   goodies/trunk/xfce4-mount-plugin/debian/control
   goodies/trunk/xfce4-mount-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-mount-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-mount-plugin:4419-5287

Modified: goodies/trunk/xfce4-mount-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mount-plugin/debian/changelog	2011-04-02 21:23:46 UTC (rev 5287)
+++ goodies/trunk/xfce4-mount-plugin/debian/changelog	2011-04-02 21:25:06 UTC (rev 5288)
@@ -7,8 +7,19 @@
   * debian/watch edited to track Xfce archive reorganisation.
   * debian/control:
     - switch to xfce section.
+    - add build-dep on libxfcegui4-dev. 
+    - update standards version to 3.9.1. 
+    - update debhelper build-dep to 7.
+    - add build-dep on hardening-includes.
+    - add dependency on ${misc:Depends}.
+  * debian/compat bumped to 7. 
+  * 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, 19 Jun 2010 13:16:17 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 10:04:42 +0100
 
 xfce4-mount-plugin (0.5.5-1) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-mount-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-mount-plugin/debian/compat	2011-04-02 21:23:46 UTC (rev 5287)
+++ goodies/trunk/xfce4-mount-plugin/debian/compat	2011-04-02 21:25:06 UTC (rev 5288)
@@ -1 +1 @@
-4
+7

Modified: goodies/trunk/xfce4-mount-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-mount-plugin/debian/control	2011-04-02 21:23:46 UTC (rev 5287)
+++ goodies/trunk/xfce4-mount-plugin/debian/control	2011-04-02 21:25:06 UTC (rev 5288)
@@ -3,15 +3,17 @@
 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 (>= 4.1), libgtk2.0-dev, xfce4-panel-dev (>= 4.4.1), libxml2-dev, libstartup-notification0-dev, libxml-parser-perl
-Standards-Version: 3.7.3
+Build-Depends: autotools-dev, cdbs, debhelper (>= 7), libgtk2.0-dev, 
+ xfce4-panel-dev (>= 4.4.1), libxml2-dev, libstartup-notification0-dev, 
+ libxml-parser-perl, libxfcegui4-dev, hardening-includes, libxfcegui4-dev
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mount-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-mount-plugin/
 
 Package: xfce4-mount-plugin
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: mount plugin for the Xfce4 panel
  This plugin for Xfce displays a list of the various devices available, giving
  the opportunity to mount/umount them.

Modified: goodies/trunk/xfce4-mount-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-mount-plugin/debian/rules	2011-04-02 21:23:46 UTC (rev 5287)
+++ goodies/trunk/xfce4-mount-plugin/debian/rules	2011-04-02 21:25:06 UTC (rev 5288)
@@ -1,8 +1,15 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
+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
+
 binary-post-install/xfce4-mount-plugin::
 	-rm -rf debian/xfce4-mount-plugin/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/xfce4-mount-plugin/usr/lib/xfce4/panel-plugins/*.la