r27521 - in /desktop/experimental/gvfs/debian: changelog patches/04_hurd_path_max.patch patches/07_smb_initialdir.patch patches/series

[hertzog at users.alioth.debian.org]

Author: hertzog
Date: Wed Apr 13 15:08:56 2011
New Revision: 27521

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27521
Log:
* New upstream release.
* Drop 07_smb_initialdir.patch, merged upstream.
* Update 04_hurd_path_max.patch to apply again, and a fix in the patch
  itself (the #ifdef-ed code was not matching the original code, missing
  an assignation).

Removed:
    desktop/experimental/gvfs/debian/patches/07_smb_initialdir.patch
Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch
    desktop/experimental/gvfs/debian/patches/series

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=27521&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Wed Apr 13 15:08:56 2011
@@ -1,6 +1,14 @@
-gvfs (1.7.2-2) UNRELEASED; urgency=low
-
+gvfs (1.8.0-1) UNRELEASED; urgency=low
+
+  [ Josselin Mouette ]
   * Set section: gnome, keep libs only for gvfs itself.
+
+  [ Raphaël Hertzog ]
+  * New upstream release.
+  * Drop 07_smb_initialdir.patch, merged upstream.
+  * Update 04_hurd_path_max.patch to apply again, and a fix in the patch
+    itself (the #ifdef-ed code was not matching the original code, missing
+    an assignation).
 
  -- Josselin Mouette <joss at debian.org>  Wed, 16 Mar 2011 21:13:01 +0100
 

Modified: desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch?rev=27521&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/04_hurd_path_max.patch [utf-8] Wed Apr 13 15:08:56 2011
@@ -3,7 +3,7 @@
 
 --- a/monitor/hal/ghalvolumemonitor.c
 +++ b/monitor/hal/ghalvolumemonitor.c
-@@ -739,11 +739,23 @@
+@@ -739,11 +739,23 @@ get_mount_point_for_device (HalDevice *d
          }
        else
          {
@@ -30,7 +30,7 @@
  
 --- a/monitor/gdu/ggduvolumemonitor.c
 +++ b/monitor/gdu/ggduvolumemonitor.c
-@@ -699,15 +699,27 @@
+@@ -695,15 +695,28 @@ get_mount_point_for_device (GduDevice *d
          }
        else
          {
@@ -42,6 +42,7 @@
 +              g_strcmp0 (resolved_fstab_device_file, device_file) == 0)
 +            {
 +              free (resolved_fstab_device_file);
++              ret = mount_point;
 +              goto out;
 +            }
 +          free(resolved_fstab_device_file);
@@ -59,7 +60,7 @@
          }
      }
  
-@@ -1427,15 +1439,29 @@
+@@ -1423,15 +1436,27 @@ update_fstab_volumes (GGduVolumeMonitor
        device_file = g_unix_mount_point_get_device_path (mount_point);
        if (g_str_has_prefix (device_file, "/dev/"))
          {
@@ -70,15 +71,13 @@
 +
 +          /* doesn't exist */
 +          resolved_path = realpath (device_file, NULL);
-+          if (resolved_path == NULL) {
-+            free(resolved_path);
++          if (resolved_path == NULL)
 +            continue;
-+          }
 +#else
 +          gchar resolved_path[PATH_MAX];
  
            /* doesn't exist */
--          if (realpath (device_file, resolved_path) != 0)
+-          if (realpath (device_file, resolved_path) != NULL)
 +          if (realpath (device_file, resolved_path) == NULL)
              continue;
 +#endif

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=27521&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Wed Apr 13 15:08:56 2011
@@ -2,4 +2,3 @@
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
-07_smb_initialdir.patch