r22734 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/12_monitor_network_fs.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jan  9 09:59:37 2010
New Revision: 22734

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22734
Log:
12_monitor_network_fs.patch: new patch. Don’t monitor remote 
filesystems for their free size. Closes: #563592.

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/12_monitor_network_fs.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=22734&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Sat Jan  9 09:59:37 2010
@@ -1,9 +1,11 @@
-gnome-settings-daemon (2.28.1-2) UNRELEASED; urgency=low
+gnome-settings-daemon (2.28.1-2) unstable; urgency=low
 
   * Drop libxxf86misc-dev build-dependency. This extension is only used 
     as a fallback to XKB. Closes: #559690.
+  * 12_monitor_network_fs.patch: new patch. Don’t monitor remote 
+    filesystems for their free size. Closes: #563592.
 
- -- Josselin Mouette <joss at debian.org>  Mon, 07 Dec 2009 09:57:08 +0100
+ -- Josselin Mouette <joss at debian.org>  Sat, 09 Jan 2010 10:59:14 +0100
 
 gnome-settings-daemon (2.28.1-1) unstable; urgency=low
 

Added: desktop/unstable/gnome-settings-daemon/debian/patches/12_monitor_network_fs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/12_monitor_network_fs.patch?rev=22734&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/12_monitor_network_fs.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/12_monitor_network_fs.patch [utf-8] Sat Jan  9 09:59:37 2010
@@ -1,0 +1,42 @@
+Debian #563592
+GNOME #606421
+
+Index: gnome-settings-daemon-2.28.1/plugins/housekeeping/gsd-disk-space.c
+===================================================================
+--- gnome-settings-daemon-2.28.1.orig/plugins/housekeeping/gsd-disk-space.c	2010-01-08 16:18:59.000000000 +0100
++++ gnome-settings-daemon-2.28.1/plugins/housekeeping/gsd-disk-space.c	2010-01-08 16:31:40.000000000 +0100
+@@ -302,10 +302,13 @@
+          * expose this in a way that allows it to be used for this
+          * purpose
+          */
++
++        /* We also ignore network filesystems. */
+                  
+         const gchar *ignore_fs[] = {
+                 "auto",
+                 "autofs",
++                "autofs4",
+                 "devfs",
+                 "devpts",
+                 "ecryptfs",
+@@ -321,6 +324,20 @@
+                 "nfsd",
+                 "rpc_pipefs",
+                 "zfs",
++
++                "adfs",
++                "afs",
++                "cifs",
++                "cxfs",
++                "gfs",
++                "gfs2",
++                "lustre",
++                "lustre_lite",
++                "ncpfs",
++                "nfs",
++                "nfs4",
++                "ocfs2",
++                "smbfs",
+                 NULL
+         };
+         const gchar *ignore_devices[] = {

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=22734&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Sat Jan  9 09:59:37 2010
@@ -2,6 +2,7 @@
 02_missing_libs.patch
 03_maintainer_mode.patch
 11_sleepkey.patch
+12_monitor_network_fs.patch
 20_gstreamer.patch
 30_pkgconfig-path.patch
 70_relibtoolize.patch