[Pkg-xfce-commits] r5274 - in goodies/trunk/xfce4-fsguard-plugin: . debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-04-02 19:32:03 +0000 (Sat, 02 Apr 2011)
New Revision: 5274

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


Property changes on: goodies/trunk/xfce4-fsguard-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-fsguard-plugin:4820-5273

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/changelog	2011-04-02 17:38:08 UTC (rev 5273)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/changelog	2011-04-02 19:32:03 UTC (rev 5274)
@@ -1,4 +1,4 @@
-xfce4-fsguard-plugin (0.4.2-2) UNRELEASED; urgency=low
+xfce4-fsguard-plugin (1.0.0-1) UNRELEASED; urgency=low
 
   [ Evgeni Golov ]
   * Fix Vcs-* fields, they were missing 'trunk' in the path.
@@ -13,6 +13,21 @@
     - update standards version to 3.8.3.
     - move to xfce section.
 
+  [ Lionel Le Folgoc ]
+  * Upload to unstable.
+  * New upstream release.
+  * debian/compat: bump to 7.
+  * debian/control:
+    - drop cdbs and bump dh b-dep to >= 7.0.50~
+    - b-dep on hardening-includes.
+    - update standards version to 3.9.1.
+  * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - switch to dh.
+    - 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>  Tue, 08 Sep 2009 03:12:01 +0200
 
 xfce4-fsguard-plugin (0.4.2-1) unstable; urgency=low

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/compat	2011-04-02 17:38:08 UTC (rev 5273)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/compat	2011-04-02 19:32:03 UTC (rev 5274)
@@ -1 +1 @@
-5
+7

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/control	2011-04-02 17:38:08 UTC (rev 5273)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/control	2011-04-02 19:32:03 UTC (rev 5274)
@@ -2,11 +2,14 @@
 Section: xfce
 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>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), xfce4-panel-dev (>= 4.4.1),
- libxml2-dev, libxml-parser-perl, intltool, libx11-dev, pkg-config, 
- libgtk2.0-dev, libxfcegui4-dev,
-Standards-Version: 3.8.3
+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>,
+ Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7.0.50~), xfce4-panel-dev (>= 4.4.1),
+ libxml2-dev, libxml-parser-perl, intltool, libx11-dev, pkg-config,
+ libgtk2.0-dev, libxfcegui4-dev, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/
@@ -15,6 +18,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: filesystem monitor plugin for the Xfce4 panel
- The fsguard plugin checks free space on a chosen mount point 
+ The fsguard plugin checks free space on a chosen mount point
  frequently and displays an alarm if free space is less than
  given alarm limit.

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/rules	2011-04-02 17:38:08 UTC (rev 5273)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/rules	2011-04-02 19:32:03 UTC (rev 5274)
@@ -1,9 +1,17 @@
 #!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
 
-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
+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-fsguard-plugin::
+export CFLAGS LDFLAGS
+
+override_dh_install:
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+	dh_install --fail-missing
+
+%:
+	dh $@