← Back to branch summary

~ubuntu-branches/ubuntu/hardy/glib2.0/hardy-updates

« back to all changes in this revision

Viewing changes to debian/patches/04_nfs4.patch

  • Committer: Bazaar Package Importer
  • Author(s): Loic Minier
  • Date: 2008-03-20 16:42:00 UTC
  • Revision ID: james.westby@ubuntu.com-20080320164200-t5fsm3wsxyr3538y
Tags: 2.16.1-2~hardy1
* Drop nautilus conflicts as it triggers a bug in the APT resolver on
  dist-upgrade.
* Update patch 01_gettext-desktopfiles with a newer version taken from the
  Ubuntu package.
* Update and enable patch 01_gettext-desktopfiles to also look for
  X-Debian-Gettext-Domain if X-Ubuntu-Gettext-Domain isn't present.
* Snapshot to hardy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_nfs4.patch
 
1
Index: glib-2.16.1/gio/gunixmounts.c
 
2
===================================================================
 
3
--- glib-2.16.1.orig/gio/gunixmounts.c  2008-03-11 21:33:36.532195382 +0100
 
4
+++ glib-2.16.1/gio/gunixmounts.c       2008-03-11 21:33:48.736197471 +0100
 
5
@@ -1575,7 +1575,8 @@ guess_mount_type (const char *mount_path
 
6
       (strcmp (filesystem_type, "iso9660") == 0) ||
 
7
       (strcmp (filesystem_type, "cd9660") == 0))
 
8
     type = G_UNIX_MOUNT_TYPE_CDROM;
 
9
-  else if (strcmp (filesystem_type, "nfs") == 0)
 
10
+  else if ((strcmp (filesystem_type, "nfs") == 0) ||
 
11
+           (strcmp (filesystem_type, "nfs4") == 0))
 
12
     type = G_UNIX_MOUNT_TYPE_NFS;
 
13
   else if (g_str_has_prefix (device_path, "/vol/dev/diskette/") ||
 
14
           g_str_has_prefix (device_path, "/dev/fd") ||