diffstat for xfce4-fsguard-plugin-1.0.1 xfce4-fsguard-plugin-1.0.1

 changelog                     |    6 ++++++
 control                       |    3 ++-
 patches/01-small-drives.patch |   27 +++++++++++++++++++++++++++
 patches/series                |    1 +
 4 files changed, 36 insertions(+), 1 deletion(-)

diff -Nru xfce4-fsguard-plugin-1.0.1/debian/changelog xfce4-fsguard-plugin-1.0.1/debian/changelog
--- xfce4-fsguard-plugin-1.0.1/debian/changelog	2013-05-24 05:33:26.000000000 +0000
+++ xfce4-fsguard-plugin-1.0.1/debian/changelog	2014-04-08 01:20:43.000000000 +0000
@@ -1,3 +1,9 @@
+xfce4-fsguard-plugin (1.0.1-2ubuntu1) trusty; urgency=medium
+
+  * Add 01-small-drives.patch to better support sizes below ~1GB
+
+ -- Jackson Doak <noskcaj@ubuntu.com>  Mon, 07 Apr 2014 06:40:36 +1000
+
 xfce4-fsguard-plugin (1.0.1-2) unstable; urgency=low
 
   * debian/rules:
diff -Nru xfce4-fsguard-plugin-1.0.1/debian/control xfce4-fsguard-plugin-1.0.1/debian/control
--- xfce4-fsguard-plugin-1.0.1/debian/control	2013-05-24 05:33:21.000000000 +0000
+++ xfce4-fsguard-plugin-1.0.1/debian/control	2014-04-08 01:20:43.000000000 +0000
@@ -1,7 +1,8 @@
 Source: xfce4-fsguard-plugin
 Section: xfce
 Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac@debian.org>,
  Lionel Le Folgoc <mrpouit@gmail.com>
 Build-Depends: debhelper (>= 9), xfce4-panel-dev,
diff -Nru xfce4-fsguard-plugin-1.0.1/debian/patches/01-small-drives.patch xfce4-fsguard-plugin-1.0.1/debian/patches/01-small-drives.patch
--- xfce4-fsguard-plugin-1.0.1/debian/patches/01-small-drives.patch	1970-01-01 00:00:00.000000000 +0000
+++ xfce4-fsguard-plugin-1.0.1/debian/patches/01-small-drives.patch	2014-04-08 01:20:43.000000000 +0000
@@ -0,0 +1,27 @@
+Author: Stephen Lyons <slysven@virginmedia.com>
+Description: BugFix: Tool-tip giving wrong message for fs size < ~1GB.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722489
+
+---
+ panel-plugin/fsguard.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/panel-plugin/fsguard.c
++++ b/panel-plugin/fsguard.c
+@@ -291,10 +291,15 @@ fsguard_check_fs (FsGuard *fsguard)
+                     (*(fsguard->name) != '\0' && strcmp(fsguard->path, fsguard->name)) ?
+                     _("%s/%s space left on %s (%s)") : _("%s/%s space left on %s"),
+                     msg_size, msg_total_size, fsguard->path, fsguard->name);
+-    } else {
++    } else if (total > 0 ) {
+         g_snprintf (msg_total_size, sizeof (msg_total_size), _("%.0f MB"), total);
+         g_snprintf (msg_size, sizeof (msg_size), _("%.0f MB"), freespace);
+         g_snprintf (msg, sizeof (msg),
++                    (*(fsguard->name) != '\0' && strcmp(fsguard->path, fsguard->name)) ?
++                    _("%s/%s space left on %s (%s)") : _("%s/%s space left on %s"),
++                    msg_size, msg_total_size, fsguard->path, fsguard->name);
++    } else {
++        g_snprintf (msg, sizeof (msg),
+                     _("could not check mountpoint %s, please check your config"),
+                     fsguard->path);
+     }
diff -Nru xfce4-fsguard-plugin-1.0.1/debian/patches/series xfce4-fsguard-plugin-1.0.1/debian/patches/series
--- xfce4-fsguard-plugin-1.0.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ xfce4-fsguard-plugin-1.0.1/debian/patches/series	2014-04-08 01:20:43.000000000 +0000
@@ -0,0 +1 @@
+01-small-drives.patch