r15012 - in /desktop/unstable/glib2.0/debian: changelog patches/02_usr_share_gnome_applications.patch patches/03_blacklist-directories.patch patches/04_nfs4.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Mar 11 20:33:33 UTC 2008 

Author: joss
Date: Tue Mar 11 20:33:32 2008
New Revision: 15012

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15012
Log:
* 02_usr_share_gnome_applications.patch: ported from GnomeVFS. Use 
  /usr/share/gnome/applications/defaults.list to obtain the defaults 
  for MIME mapping. Currently this file is still shipped by GnomeVFS.
  Closes: #469504.
* 03_blacklist-directories.patch: ported from GnomeVFS. Blacklist more 
  FHS directories that are commonly found as Unix mount points, 
  including those necessary for live-initramfs.
* 04_nfs4.patch: ported from GnomeVFS. Support for nfs4 filesystems.

Added:
    desktop/unstable/glib2.0/debian/patches/02_usr_share_gnome_applications.patch
    desktop/unstable/glib2.0/debian/patches/03_blacklist-directories.patch
    desktop/unstable/glib2.0/debian/patches/04_nfs4.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=15012&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Tue Mar 11 20:33:32 2008
@@ -1,3 +1,16 @@
+glib2.0 (2.16.1-2) UNRELEASED; urgency=low
+
+  * 02_usr_share_gnome_applications.patch: ported from GnomeVFS. Use 
+    /usr/share/gnome/applications/defaults.list to obtain the defaults 
+    for MIME mapping. Currently this file is still shipped by GnomeVFS.
+    Closes: #469504.
+  * 03_blacklist-directories.patch: ported from GnomeVFS. Blacklist more 
+    FHS directories that are commonly found as Unix mount points, 
+    including those necessary for live-initramfs.
+  * 04_nfs4.patch: ported from GnomeVFS. Support for nfs4 filesystems.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 11 Mar 2008 20:59:50 +0100
+
 glib2.0 (2.16.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: desktop/unstable/glib2.0/debian/patches/02_usr_share_gnome_applications.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/02_usr_share_gnome_applications.patch?rev=15012&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/02_usr_share_gnome_applications.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/02_usr_share_gnome_applications.patch Tue Mar 11 20:33:32 2008
@@ -1,0 +1,18 @@
+Index: glib-2.16.1/gio/gdesktopappinfo.c
+===================================================================
+--- glib-2.16.1.orig/gio/gdesktopappinfo.c	2008-03-11 20:58:33.600196803 +0100
++++ glib-2.16.1/gio/gdesktopappinfo.c	2008-03-11 20:59:26.728196738 +0100
+@@ -110,11 +110,12 @@ search_path_init (gpointer data)
+   data_dirs = g_get_system_data_dirs ();
+   length = g_strv_length ((char **) data_dirs);
+   
+-  args = g_new (char *, length + 2);
++  args = g_new (char *, length + 3);
+   
+   j = 0;
+   user_data_dir = g_get_user_data_dir ();
+   args[j++] = g_build_filename (user_data_dir, "applications", NULL);
++  args[j++] = g_strdup("/usr/share/gnome/applications");
+   for (i = 0; i < length; i++)
+     args[j++] = g_build_filename (data_dirs[i],
+ 				  "applications", NULL);

Added: desktop/unstable/glib2.0/debian/patches/03_blacklist-directories.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/03_blacklist-directories.patch?rev=15012&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/03_blacklist-directories.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/03_blacklist-directories.patch Tue Mar 11 20:33:32 2008
@@ -1,0 +1,26 @@
+Index: glib-2.16.1/gio/gunixmounts.c
+===================================================================
+--- glib-2.16.1.orig/gio/gunixmounts.c	2008-03-11 21:06:15.332196503 +0100
++++ glib-2.16.1/gio/gunixmounts.c	2008-03-11 21:08:12.880197371 +0100
+@@ -220,6 +220,8 @@ g_unix_is_mount_path_system_internal (co
+     "/home",
+     "/lib",
+     "/lib64",
++    "/live/cow",
++    "/live/image",
+     "/media",
+     "/mnt",
+     "/opt",
+@@ -230,7 +232,12 @@ g_unix_is_mount_path_system_internal (co
+     "/usr",
+     "/usr/local",
+     "/var",
++    "/var/crash",
++    "/var/local",
++    "/var/log",
+     "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
++    "/var/mail",
++    "/var/run",
+     "/var/tmp",       /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
+     "/proc",
+     "/sbin",

Added: desktop/unstable/glib2.0/debian/patches/04_nfs4.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/04_nfs4.patch?rev=15012&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/04_nfs4.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/04_nfs4.patch Tue Mar 11 20:33:32 2008
@@ -1,0 +1,14 @@
+Index: glib-2.16.1/gio/gunixmounts.c
+===================================================================
+--- glib-2.16.1.orig/gio/gunixmounts.c	2008-03-11 21:33:36.532195382 +0100
++++ glib-2.16.1/gio/gunixmounts.c	2008-03-11 21:33:48.736197471 +0100
+@@ -1575,7 +1575,8 @@ guess_mount_type (const char *mount_path
+       (strcmp (filesystem_type, "iso9660") == 0) ||
+       (strcmp (filesystem_type, "cd9660") == 0))
+     type = G_UNIX_MOUNT_TYPE_CDROM;
+-  else if (strcmp (filesystem_type, "nfs") == 0)
++  else if ((strcmp (filesystem_type, "nfs") == 0) ||
++           (strcmp (filesystem_type, "nfs4") == 0))
+     type = G_UNIX_MOUNT_TYPE_NFS;
+   else if (g_str_has_prefix (device_path, "/vol/dev/diskette/") ||
+ 	   g_str_has_prefix (device_path, "/dev/fd") ||

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=15012&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series (original)
+++ desktop/unstable/glib2.0/debian/patches/series Tue Mar 11 20:33:32 2008
@@ -1,2 +1,5 @@
 #01_gettext-desktopfiles.patch
+02_usr_share_gnome_applications.patch
+03_blacklist-directories.patch
+04_nfs4.patch
 60_wait-longer-for-threads-to-die.patch

More information about the pkg-gnome-commits mailing list