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

[Yves-Alexis Perez]

Author: corsac
Date: 2012-06-30 13:20:47 +0000 (Sat, 30 Jun 2012)
New Revision: 7075

Removed:
   goodies/trunk/xfce4-fsguard-plugin/debian/patches/01_fix-resource-file-loading.patch
   goodies/trunk/xfce4-fsguard-plugin/debian/patches/02_include_sys_vfs_h_on_gnu.patch
   goodies/trunk/xfce4-fsguard-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-fsguard-plugin/debian/changelog
Log:
* debian/patches:
  - 01_fix-resource-file-loading dropped, included upstream.
  - 02_include_sys_vfs_h_on_gnu as well. 

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/changelog	2012-06-30 13:12:51 UTC (rev 7074)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/changelog	2012-06-30 13:20:47 UTC (rev 7075)
@@ -1,6 +1,9 @@
 xfce4-fsguard-plugin (1.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - 01_fix-resource-file-loading dropped, included upstream.
+    - 02_include_sys_vfs_h_on_gnu as well. 
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 30 Jun 2012 15:12:43 +0200
 

Deleted: goodies/trunk/xfce4-fsguard-plugin/debian/patches/01_fix-resource-file-loading.patch
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/patches/01_fix-resource-file-loading.patch	2012-06-30 13:12:51 UTC (rev 7074)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/patches/01_fix-resource-file-loading.patch	2012-06-30 13:20:47 UTC (rev 7075)
@@ -1,37 +0,0 @@
-Description: fix settings loading
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637160
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8821
---- xfce4-fsguard-plugin-1.0.0.orig/panel-plugin/fsguard.c
-+++ xfce4-fsguard-plugin-1.0.0/panel-plugin/fsguard.c
-@@ -325,15 +325,28 @@ fsguard_read_config (FsGuard *fsguard)
-     char               *file;
-     XfceRc             *rc;
- 
--    file = xfce_panel_plugin_save_location (fsguard->plugin, TRUE);
-+    /* prepare default values */
-+    fsguard->seen               = FALSE;
-+    fsguard->name               = g_strdup ("");
-+    fsguard->show_name          = FALSE;
-+    fsguard->path               = g_strdup ("/");
-+    fsguard->show_size          = TRUE;
-+    fsguard->show_progress_bar  = TRUE;
-+    fsguard->hide_button        = FALSE;
-+    fsguard->limit_warning      = 8;
-+    fsguard->limit_urgent       = 2;
-+
-+    file = xfce_panel_plugin_lookup_rc_file(fsguard->plugin);
-+    g_return_if_fail (file);
-     DBG ("Lookup rc file `%s'", file);
--    rc = xfce_rc_simple_open (file, FALSE);
-+    rc = xfce_rc_simple_open (file, TRUE);
-     g_free (file);
-     g_return_if_fail (rc);
- 
--    fsguard->seen               = FALSE;
-+    g_free (fsguard->name);
-     fsguard->name               = g_strdup (xfce_rc_read_entry (rc, "label", ""));
-     fsguard->show_name          = xfce_rc_read_bool_entry (rc, "label_visible", FALSE);
-+    g_free (fsguard->path);
-     fsguard->path               = g_strdup (xfce_rc_read_entry (rc, "mnt", "/"));
-     fsguard->show_size          = xfce_rc_read_bool_entry (rc, "lab_size_visible", TRUE);
-     fsguard->show_progress_bar  = xfce_rc_read_bool_entry (rc, "progress_bar_visible", TRUE);

Deleted: goodies/trunk/xfce4-fsguard-plugin/debian/patches/02_include_sys_vfs_h_on_gnu.patch
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/patches/02_include_sys_vfs_h_on_gnu.patch	2012-06-30 13:12:51 UTC (rev 7074)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/patches/02_include_sys_vfs_h_on_gnu.patch	2012-06-30 13:20:47 UTC (rev 7075)
@@ -1,14 +0,0 @@
-Description: Fix FTBFS on GNU/Hurd
-Bug-Debian: http://bugs.debian.org/670879
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8820
---- xfce4-fsguard-plugin.orig/panel-plugin/fsguard.c	2012-04-29 04:35:14.000000000 +0000
-+++ xfce4-fsguard-plugin/panel-plugin/fsguard.c	2012-04-29 04:32:51.000000000 +0000
-@@ -38,7 +38,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__GNU__)
- #include <sys/vfs.h>
- #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
- #include <sys/param.h>

Deleted: goodies/trunk/xfce4-fsguard-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/patches/series	2012-06-30 13:12:51 UTC (rev 7074)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/patches/series	2012-06-30 13:20:47 UTC (rev 7075)
@@ -1,2 +0,0 @@
-01_fix-resource-file-loading.patch
-02_include_sys_vfs_h_on_gnu.patch