r22984 - in /desktop/unstable/gnome-vfs/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat Feb 6 10:59:16 UTC 2010
Author: biebl
Date: Sat Feb 6 10:59:14 2010
New Revision: 22984
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22984
Log:
Refresh all patches so they apply cleanly. This fixes FTBFS with the new
source format 3.0 (quilt). Closes: #538622
Modified:
desktop/unstable/gnome-vfs/debian/changelog
desktop/unstable/gnome-vfs/debian/patches/01_fstab_edit_crash.patch
desktop/unstable/gnome-vfs/debian/patches/02_audiocd_readonly.patch
desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch
desktop/unstable/gnome-vfs/debian/patches/04_sftp_pam_krb5.patch
desktop/unstable/gnome-vfs/debian/patches/05_default_modules.patch
desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch
desktop/unstable/gnome-vfs/debian/patches/07_trash_location.patch
desktop/unstable/gnome-vfs/debian/patches/08_recursive_local_check.patch
desktop/unstable/gnome-vfs/debian/patches/09_gnomevfs_mount_selection.patch
desktop/unstable/gnome-vfs/debian/patches/10_configuration_loop.patch
desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch
desktop/unstable/gnome-vfs/debian/patches/12_user_visible_drives.patch
desktop/unstable/gnome-vfs/debian/patches/13_resolve_fstab_symlinks.patch
desktop/unstable/gnome-vfs/debian/patches/14_app_cdda.patch
desktop/unstable/gnome-vfs/debian/patches/15_uuid_mount.patch
desktop/unstable/gnome-vfs/debian/patches/16_no_extra_dbus_messages.patch
desktop/unstable/gnome-vfs/debian/patches/19_hurd_path_max.patch
desktop/unstable/gnome-vfs/debian/patches/20_dont_register_keys_for_gaim.patch
desktop/unstable/gnome-vfs/debian/patches/22_ignore_inaccessible_volumes.patch
desktop/unstable/gnome-vfs/debian/patches/23_improve_volume_labels.patch
desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch
desktop/unstable/gnome-vfs/debian/patches/30_nfs4.patch
desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch
desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch
Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/changelog [utf-8] Sat Feb 6 10:59:14 2010
@@ -11,6 +11,8 @@
- Drop gnome-mount Recommends from libgnomevfs2-0. GNOME uses gvfs for
mount handling so installing gnome-mount by default is no longer
justified. Closes: #568420
+ * Refresh all patches so they apply cleanly. This fixes FTBFS with the new
+ source format 3.0 (quilt). Closes: #538622
-- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 12 Dec 2009 16:21:37 +0100
Modified: desktop/unstable/gnome-vfs/debian/patches/01_fstab_edit_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/01_fstab_edit_crash.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/01_fstab_edit_crash.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/01_fstab_edit_crash.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,10 +1,10 @@
# upstream http://bugzilla.gnome.org/show_bug.cgi?id=300547
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-04-10 14:03:59.000000000 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 22:59:25.352066750 +0200
-@@ -740,6 +740,9 @@
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2010-02-06 11:55:44.829288390 +0100
+@@ -743,6 +743,9 @@
mount = l->data;
uri = gnome_vfs_get_uri_from_local_path (mount->mount_path);
Modified: desktop/unstable/gnome-vfs/debian/patches/02_audiocd_readonly.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/02_audiocd_readonly.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/02_audiocd_readonly.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/02_audiocd_readonly.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-hal-mounts.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2007-04-10 14:03:59.000000000 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 22:59:58.054110500 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-hal-mounts.c 2010-02-06 11:55:45.209277862 +0100
@@ -1038,17 +1038,19 @@
vol->priv->volume_type = GNOME_VFS_VOLUME_TYPE_VFS_MOUNT;
vol->priv->activation_uri = g_strdup_printf ("cdda://%s",
Modified: desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/03_gnutls27.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -6,11 +6,11 @@
Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
Use pkg-config in place of gnutls own macro since it's not present anymore.
-Index: gnome-vfs-2.24.1/configure.in
+Index: gnome-vfs-2.24.2/configure.in
===================================================================
---- gnome-vfs-2.24.1.orig/configure.in 2009-08-08 17:12:12.591942620 +0200
-+++ gnome-vfs-2.24.1/configure.in 2009-08-08 17:13:10.220966076 +0200
-@@ -668,14 +668,14 @@ if test "x$enable_gnutls" = "xyes"; then
+--- gnome-vfs-2.24.2.orig/configure.in 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/configure.in 2010-02-06 11:55:45.497282437 +0100
+@@ -668,14 +668,14 @@
AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
else
AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
Modified: desktop/unstable/gnome-vfs/debian/patches/04_sftp_pam_krb5.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/04_sftp_pam_krb5.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/04_sftp_pam_krb5.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/04_sftp_pam_krb5.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/modules/sftp-method.c
+Index: gnome-vfs-2.24.2/modules/sftp-method.c
===================================================================
---- gnome-vfs-2.18.1.orig/modules/sftp-method.c 2007-04-10 14:03:56.000000000 +0200
-+++ gnome-vfs-2.18.1/modules/sftp-method.c 2007-05-03 23:01:02.282124500 +0200
+--- gnome-vfs-2.24.2.orig/modules/sftp-method.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/modules/sftp-method.c 2010-02-06 11:55:45.785283080 +0100
@@ -1315,6 +1315,8 @@
if (g_str_has_suffix (buffer, "password: ") ||
g_str_has_suffix (buffer, "Password: ") ||
Modified: desktop/unstable/gnome-vfs/debian/patches/05_default_modules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/05_default_modules.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/05_default_modules.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/05_default_modules.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/modules/default-modules.conf
+Index: gnome-vfs-2.24.2/modules/default-modules.conf
===================================================================
---- gnome-vfs-2.18.1.orig/modules/default-modules.conf 2007-04-10 14:03:56.000000000 +0200
-+++ gnome-vfs-2.18.1/modules/default-modules.conf 2007-05-03 23:01:06.138365500 +0200
+--- gnome-vfs-2.24.2.orig/modules/default-modules.conf 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/modules/default-modules.conf 2010-02-06 11:55:46.073282906 +0100
@@ -6,8 +6,6 @@
# <method 1> <method 2> ... <method N> : <module>
#
Modified: desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,9 @@
unchanged:
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 23:07:30.686398250 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 23:12:04.779528000 +0200
-@@ -645,7 +645,20 @@
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-hal-mounts.c
+===================================================================
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2010-02-06 11:55:45.209277862 +0100
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-hal-mounts.c 2010-02-06 11:55:46.357284162 +0100
+@@ -645,6 +645,19 @@
"/var",
"/proc",
"/sbin",
@@ -21,8 +23,7 @@
NULL
};
- ret = FALSE;
-@@ -741,6 +746,12 @@
+@@ -694,6 +707,12 @@
if (strcmp (mount_point, fhs23_toplevel_mount_points[i]) == 0)
goto out;
}
Modified: desktop/unstable/gnome-vfs/debian/patches/07_trash_location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/07_trash_location.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/07_trash_location.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/07_trash_location.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,8 +1,8 @@
-Index: gnome-vfs-2.22.0/modules/file-method.c
+Index: gnome-vfs-2.24.2/modules/file-method.c
===================================================================
---- gnome-vfs-2.22.0.orig/modules/file-method.c 2008-05-28 00:18:51.337149833 +0200
-+++ gnome-vfs-2.22.0/modules/file-method.c 2008-05-28 00:30:05.717653291 +0200
-@@ -1390,11 +1390,11 @@ append_trash_path (const char *path)
+--- gnome-vfs-2.24.2.orig/modules/file-method.c 2009-05-25 10:37:05.000000000 +0200
++++ gnome-vfs-2.24.2/modules/file-method.c 2010-02-06 11:55:46.645282580 +0100
+@@ -1391,11 +1391,11 @@
char *per_user_part;
char *retval;
@@ -18,7 +18,7 @@
g_free (per_user_part);
-@@ -1993,7 +1993,7 @@ do_find_directory (GnomeVFSMethod *metho
+@@ -1994,7 +1994,7 @@
}
} else {
/* volume with a home directory, just create a trash in home */
Modified: desktop/unstable/gnome-vfs/debian/patches/08_recursive_local_check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/08_recursive_local_check.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/08_recursive_local_check.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/08_recursive_local_check.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/modules/file-method.c
+Index: gnome-vfs-2.24.2/modules/file-method.c
===================================================================
---- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-04-10 14:03:56.000000000 +0200
-+++ gnome-vfs-2.18.1/modules/file-method.c 2007-05-03 23:01:11.558704250 +0200
+--- gnome-vfs-2.24.2.orig/modules/file-method.c 2010-02-06 11:55:46.645282580 +0100
++++ gnome-vfs-2.24.2/modules/file-method.c 2010-02-06 11:55:46.929283842 +0100
@@ -1257,6 +1257,7 @@
struct stat statbuf;
gboolean is_local;
@@ -10,7 +10,7 @@
g_return_val_if_fail (uri != NULL, FALSE);
-@@ -1264,21 +1265,22 @@
+@@ -1264,22 +1265,23 @@
if (path == NULL)
return TRUE; /* GNOME_VFS_ERROR_INVALID_URI */
Modified: desktop/unstable/gnome-vfs/debian/patches/09_gnomevfs_mount_selection.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/09_gnomevfs_mount_selection.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/09_gnomevfs_mount_selection.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/09_gnomevfs_mount_selection.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,8 +1,8 @@
? libgnomevfs/.gnome-vfs-volume-ops.c.swp
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-ops.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-ops.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-ops.c 2007-04-10 14:03:59.000000000 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-ops.c 2007-05-03 23:01:18.811157500 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-volume-ops.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-ops.c 2010-02-06 11:55:47.237281162 +0100
@@ -823,8 +823,6 @@
# if defined(HAL_MOUNT)
if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE))
Modified: desktop/unstable/gnome-vfs/debian/patches/10_configuration_loop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/10_configuration_loop.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/10_configuration_loop.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/10_configuration_loop.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-configuration.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-configuration.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-configuration.c 2007-04-10 14:03:59.000000000 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-configuration.c 2007-05-03 23:01:34.044109500 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-configuration.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-configuration.c 2010-02-06 11:55:47.525283222 +0100
@@ -358,6 +358,8 @@
guint line_buffer_size;
guint line_number;
Modified: desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,8 +1,8 @@
-Index: gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime-info-cache.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-mime-info-cache.c
===================================================================
---- gnome-vfs-2.22.0.orig/libgnomevfs/gnome-vfs-mime-info-cache.c 2008-06-14 12:48:22.265972281 +0200
-+++ gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime-info-cache.c 2008-06-14 12:52:05.342678608 +0200
-@@ -703,7 +703,13 @@ get_all_parent_types (const char *mime_t
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-mime-info-cache.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-mime-info-cache.c 2010-02-06 11:55:47.809283073 +0100
+@@ -702,7 +702,13 @@
for (i = 0; parents && parents[i] != NULL; i++) {
l = g_list_prepend (l, g_strdup (parents[i]));
}
Modified: desktop/unstable/gnome-vfs/debian/patches/12_user_visible_drives.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/12_user_visible_drives.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/12_user_visible_drives.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/12_user_visible_drives.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,9 +1,9 @@
Nur in gnome-vfs2-2.8.1.old/debian/patches: 12_user_visible_drives.patch.
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 22:59:25.352066750 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:01:46.536890250 +0200
-@@ -985,6 +985,10 @@
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2010-02-06 11:55:44.829288390 +0100
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2010-02-06 11:55:48.097278145 +0100
+@@ -988,6 +988,10 @@
vol->priv->is_user_visible = 1;
break;
default:
Modified: desktop/unstable/gnome-vfs/debian/patches/13_resolve_fstab_symlinks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/13_resolve_fstab_symlinks.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/13_resolve_fstab_symlinks.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/13_resolve_fstab_symlinks.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-unix-mounts.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-unix-mounts.c 2007-04-10 14:03:59.000000000 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c 2007-05-03 23:01:50.353128750 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-unix-mounts.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-unix-mounts.c 2010-02-06 11:55:48.381279121 +0100
@@ -541,6 +541,7 @@
char *opt, *opt_end;
struct stat sb;
Modified: desktop/unstable/gnome-vfs/debian/patches/14_app_cdda.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/14_app_cdda.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/14_app_cdda.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/14_app_cdda.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,6 +1,7 @@
-diff -Nur gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in
---- gnome-vfs2-2.12.0.orig/schemas/desktop_gnome_url_handlers.schemas.in 2004-08-14 16:08:28.000000000 +0200
-+++ gnome-vfs2-2.12.0/schemas/desktop_gnome_url_handlers.schemas.in 2005-09-29 15:16:04.000000000 +0200
+Index: gnome-vfs-2.24.2/schemas/desktop_gnome_url_handlers.schemas.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/schemas/desktop_gnome_url_handlers.schemas.in 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/schemas/desktop_gnome_url_handlers.schemas.in 2010-02-06 11:55:48.669281725 +0100
@@ -172,6 +172,40 @@
</schema>
Modified: desktop/unstable/gnome-vfs/debian/patches/15_uuid_mount.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/15_uuid_mount.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/15_uuid_mount.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/15_uuid_mount.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,6 +1,7 @@
-diff -Nur gnome-vfs2-2.16.0/libgnomevfs/gnome-vfs-unix-mounts.c gnome-vfs2-2.16.0.new/libgnomevfs/gnome-vfs-unix-mounts.c
---- gnome-vfs2-2.16.0/libgnomevfs/gnome-vfs-unix-mounts.c 2006-03-27 11:05:42.000000000 +0200
-+++ gnome-vfs2-2.16.0.new/libgnomevfs/gnome-vfs-unix-mounts.c 2006-09-25 14:23:15.000000000 +0200
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-unix-mounts.c
+===================================================================
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-unix-mounts.c 2010-02-06 11:55:48.381279121 +0100
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-unix-mounts.c 2010-02-06 11:55:48.957282940 +0100
@@ -290,6 +290,15 @@
mount_entry->mount_path = g_strdup (mntent->mnt_dir);
@@ -17,9 +18,9 @@
mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
g_hash_table_insert (mounts_hash,
-@@ -574,6 +583,30 @@
+@@ -580,6 +589,30 @@
+ mount_entry->mount_path = g_strdup (mntent->mnt_dir);
- mount_entry->mount_path = g_strdup (mntent->mnt_dir);
mount_entry->device_path = g_strdup (mntent->mnt_fsname);
+
+ if(strlen(mount_entry->device_path) >= 5 && !strncmp (mount_entry->device_path, "UUID=", 5)) {
Modified: desktop/unstable/gnome-vfs/debian/patches/16_no_extra_dbus_messages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/16_no_extra_dbus_messages.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/16_no_extra_dbus_messages.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/16_no_extra_dbus_messages.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,8 +1,10 @@
---- gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c.no-dbus 2006-09-19 13:36:28.000000000 -0400
-+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-09-19 13:37:11.000000000 -0400
-@@ -201,6 +201,9 @@
-
- volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-client.c
+===================================================================
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-client.c 2010-02-06 11:55:49.249283807 +0100
+@@ -212,6 +212,9 @@
+ if (volume_monitor_client->dbus_conn == NULL)
+ return;
+ if (volume_monitor_client->dbus_conn == NULL)
+ return;
@@ -10,9 +12,9 @@
list = get_drives (volume_monitor_client->dbus_conn, volume_monitor);
for (l = list; l; l = l->next) {
drive = l->data;
-@@ -221,6 +224,9 @@
-
- volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
+@@ -235,6 +238,9 @@
+ if (volume_monitor_client->dbus_conn == NULL)
+ return;
+ if (volume_monitor_client->dbus_conn == NULL)
+ return;
Modified: desktop/unstable/gnome-vfs/debian/patches/19_hurd_path_max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/19_hurd_path_max.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/19_hurd_path_max.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/19_hurd_path_max.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-unix-mounts.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-unix-mounts.c 2007-05-03 23:01:50.353128750 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-unix-mounts.c 2007-05-03 23:02:19.782968000 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-unix-mounts.c 2010-02-06 11:55:48.957282940 +0100
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-unix-mounts.c 2010-02-06 11:55:49.537282516 +0100
@@ -85,6 +85,9 @@
#define STAT_TIMEOUT_SECONDS 3
@@ -12,10 +12,10 @@
/* Ideally this should not nonblocking stat, since that can block on
* downed NFS mounts forever, however there seems to be no good way
-Index: gnome-vfs-2.18.1/modules/file-method.c
+Index: gnome-vfs-2.24.2/modules/file-method.c
===================================================================
---- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-05-03 23:01:11.558704250 +0200
-+++ gnome-vfs-2.18.1/modules/file-method.c 2007-05-03 23:02:19.782968000 +0200
+--- gnome-vfs-2.24.2.orig/modules/file-method.c 2010-02-06 11:55:46.929283842 +0100
++++ gnome-vfs-2.24.2/modules/file-method.c 2010-02-06 11:55:49.537282516 +0100
@@ -127,7 +127,11 @@
if (x > 0)
value = x;
@@ -28,7 +28,7 @@
}
return value;
-@@ -1659,7 +1663,7 @@
+@@ -1660,7 +1664,7 @@
char *cache_file_path;
FILE *cache_file;
char buffer[2048];
Modified: desktop/unstable/gnome-vfs/debian/patches/20_dont_register_keys_for_gaim.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/20_dont_register_keys_for_gaim.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/20_dont_register_keys_for_gaim.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/20_dont_register_keys_for_gaim.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,8 +1,8 @@
-Index: gnome-vfs-2.18.1/schemas/desktop_gnome_url_handlers.schemas.in
+Index: gnome-vfs-2.24.2/schemas/desktop_gnome_url_handlers.schemas.in
===================================================================
---- gnome-vfs-2.18.1.orig/schemas/desktop_gnome_url_handlers.schemas.in 2007-04-10 14:03:54.000000000 +0200
-+++ gnome-vfs-2.18.1/schemas/desktop_gnome_url_handlers.schemas.in 2007-05-03 23:02:25.371317250 +0200
-@@ -240,40 +240,6 @@
+--- gnome-vfs-2.24.2.orig/schemas/desktop_gnome_url_handlers.schemas.in 2010-02-06 11:55:48.669281725 +0100
++++ gnome-vfs-2.24.2/schemas/desktop_gnome_url_handlers.schemas.in 2010-02-06 11:55:49.837281614 +0100
+@@ -274,40 +274,6 @@
</schema>
<schema>
Modified: desktop/unstable/gnome-vfs/debian/patches/22_ignore_inaccessible_volumes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/22_ignore_inaccessible_volumes.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/22_ignore_inaccessible_volumes.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/22_ignore_inaccessible_volumes.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-hal-mounts.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 22:59:58.054110500 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-05-03 23:02:29.895600000 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2010-02-06 11:55:46.357284162 +0100
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-hal-mounts.c 2010-02-06 11:55:50.133278538 +0100
@@ -41,6 +41,7 @@
#include <glib.h>
@@ -10,7 +10,7 @@
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libhal.h>
-@@ -690,6 +691,10 @@
+@@ -703,6 +704,10 @@
mount_point = libhal_volume_get_mount_point (hal_volume);
/* blacklist fhs2.3 top level mount points */
if (mount_point != NULL) {
@@ -21,10 +21,10 @@
for (i = 0; fhs23_toplevel_mount_points[i] != NULL; i++) {
if (strcmp (mount_point, fhs23_toplevel_mount_points[i]) == 0)
goto out;
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:01:46.536890250 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:02:29.895600000 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2010-02-06 11:55:48.097278145 +0100
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2010-02-06 11:55:50.133278538 +0100
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <libgnomevfs/gnome-vfs-utils.h>
@@ -33,7 +33,7 @@
#include "gnome-vfs-volume-monitor-daemon.h"
#include "gnome-vfs-volume-monitor-private.h"
-@@ -1058,6 +1059,11 @@
+@@ -1061,6 +1062,11 @@
l != NULL;
l = l->next, ld = ld->next) {
GnomeVFSUnixMount *mount = l->data;
Modified: desktop/unstable/gnome-vfs/debian/patches/23_improve_volume_labels.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/23_improve_volume_labels.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/23_improve_volume_labels.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/23_improve_volume_labels.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-hal-mounts.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2007-06-27 21:57:27.566795749 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-06-27 22:48:46.818272291 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-hal-mounts.c 2010-02-06 11:55:50.133278538 +0100
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-hal-mounts.c 2010-02-06 11:55:50.437281509 +0100
@@ -328,6 +328,7 @@
LibHalDriveType drive_type;
char *name;
Modified: desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/24_home_dir_fakeroot.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,7 +1,7 @@
-Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-application-registry.c
===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-application-registry.c 2007-01-03 07:50:44.000000000 +0100
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c 2007-10-11 10:13:16.429551115 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-application-registry.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-application-registry.c 2010-02-06 11:55:50.725285502 +0100
@@ -965,7 +965,7 @@
NULL);
gnome_registry_dir.system_dir = TRUE;
@@ -11,11 +11,11 @@
".gnome",
"application-info",
NULL);
-Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-init.c
===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-init.c 2007-03-05 10:05:05.000000000 +0100
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c 2007-10-11 10:13:16.429551115 +0200
-@@ -59,29 +59,6 @@
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-init.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-init.c 2010-02-06 11:55:50.725285502 +0100
+@@ -57,29 +57,6 @@
static GPrivate * private_is_primary_thread;
@@ -45,7 +45,7 @@
static void
gnome_vfs_thread_init (void)
{
-@@ -112,7 +89,8 @@
+@@ -110,7 +87,8 @@
char *bogus_argv[2] = { "dummy", NULL };
*/
@@ -55,11 +55,11 @@
return FALSE;
}
-Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-private-utils.c
===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.c 2007-01-03 07:50:44.000000000 +0100
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c 2007-10-11 10:14:48.814815851 +0200
-@@ -1086,3 +1086,54 @@
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-private-utils.c 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-private-utils.c 2010-02-06 11:55:50.725285502 +0100
+@@ -1085,3 +1085,54 @@
}
#endif
@@ -114,10 +114,10 @@
+
+ return home;
+}
-Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-private-utils.h
===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.h 2007-01-03 07:50:44.000000000 +0100
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h 2007-10-11 10:13:16.433551342 +0200
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-private-utils.h 2009-04-20 12:46:46.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-private-utils.h 2010-02-06 11:55:50.729281262 +0100
@@ -124,6 +124,8 @@
#endif
@@ -127,11 +127,11 @@
G_END_DECLS
#endif /* _GNOME_VFS_PRIVATE_UTILS_H */
-Index: gnome-vfs-2.20.0/modules/file-method.c
+Index: gnome-vfs-2.24.2/modules/file-method.c
===================================================================
---- gnome-vfs-2.20.0.orig/modules/file-method.c 2007-10-11 10:13:16.345546327 +0200
-+++ gnome-vfs-2.20.0/modules/file-method.c 2007-10-11 10:13:16.433551342 +0200
-@@ -1536,7 +1536,7 @@
+--- gnome-vfs-2.24.2.orig/modules/file-method.c 2010-02-06 11:55:49.537282516 +0100
++++ gnome-vfs-2.24.2/modules/file-method.c 2010-02-06 11:55:50.729281262 +0100
+@@ -1537,7 +1537,7 @@
GList *p;
char *buffer, *escaped_path, *escaped_mount_point;
@@ -140,7 +140,7 @@
cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME);
if (mkdir_recursive (cache_file_parent, 0777) != 0) {
-@@ -1675,7 +1675,7 @@
+@@ -1676,7 +1676,7 @@
cached_trash_directories = NULL;
/* read in the entries from disk */
@@ -149,7 +149,7 @@
TRASH_ENTRY_CACHE_PARENT,
TRASH_ENTRY_CACHE_NAME,
NULL);
-@@ -1947,7 +1947,7 @@
+@@ -1948,7 +1948,7 @@
return GNOME_VFS_ERROR_INVALID_URI;
/* We will need the URI and the stat structure for the home directory. */
Modified: desktop/unstable/gnome-vfs/debian/patches/30_nfs4.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/30_nfs4.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/30_nfs4.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/30_nfs4.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,20 +1,20 @@
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-filesystem-type.c
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-filesystem-type.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-filesystem-type.c 2007-04-10 14:03:59.000000000 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-filesystem-type.c 2007-05-03 23:02:33.475823750 +0200
-@@ -63,6 +63,7 @@
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-filesystem-type.c 2009-10-08 16:03:36.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-filesystem-type.c 2010-02-06 11:55:51.089283831 +0100
+@@ -68,6 +68,7 @@
{ "msdos" , N_("MSDOS Volume"), 0 },
{ "msdosfs" , N_("MSDOS Volume"), 0 },
{ "nfs" , N_("NFS Network Volume"), 1 },
+ { "nfs4" , N_("NFS Network Volume"), 1 },
{ "ntfs" , N_("Windows NT Volume"), 0 },
- { "nwfs" , N_("Netware Volume"), 0 },
- { "proc" , N_("System Volume"), 0 },
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
+ { "ntfs-3g" , N_("Windows NT Volume"), 1 },
+ { "nilfs2" , N_("NILFS Linux Volume"), 1 },
+Index: gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
===================================================================
---- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:02:29.895600000 +0200
-+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-05-03 23:02:33.475823750 +0200
-@@ -892,7 +892,8 @@
+--- gnome-vfs-2.24.2.orig/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2010-02-06 11:55:50.133278538 +0100
++++ gnome-vfs-2.24.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2010-02-06 11:55:51.093281826 +0100
+@@ -895,7 +895,8 @@
if (vol->priv->device_type == GNOME_VFS_DEVICE_TYPE_UNKNOWN) {
vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_CDROM;
}
@@ -24,10 +24,10 @@
if (strstr (vol->priv->device_path, "(pid") != NULL) {
vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_AUTOFS;
} else {
-Index: gnome-vfs-2.18.1/modules/file-method.c
+Index: gnome-vfs-2.24.2/modules/file-method.c
===================================================================
---- gnome-vfs-2.18.1.orig/modules/file-method.c 2007-05-03 23:02:19.782968000 +0200
-+++ gnome-vfs-2.18.1/modules/file-method.c 2007-05-03 23:02:33.475823750 +0200
+--- gnome-vfs-2.24.2.orig/modules/file-method.c 2010-02-06 11:55:50.729281262 +0100
++++ gnome-vfs-2.24.2/modules/file-method.c 2010-02-06 11:55:51.097278145 +0100
@@ -1279,6 +1279,7 @@
G_LOCK (fstype);
type = filesystem_type (path, path, &statbuf);
Modified: desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -2,9 +2,10 @@
autoreconf -fiv
rm -rf autom4te.cache config.h.in~
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/aclocal.m4 gnome-vfs-2.24.2/aclocal.m4
---- gnome-vfs-2.24.2.old/aclocal.m4 2009-10-08 16:14:39.000000000 +0200
-+++ gnome-vfs-2.24.2/aclocal.m4 2009-10-08 18:36:58.000000000 +0200
+Index: gnome-vfs-2.24.2/aclocal.m4
+===================================================================
+--- gnome-vfs-2.24.2.orig/aclocal.m4 2009-10-08 16:14:39.000000000 +0200
++++ gnome-vfs-2.24.2/aclocal.m4 2010-02-06 11:55:51.437287096 +0100
@@ -13,1128 +13,2030 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -7317,9 +7318,10 @@
+]) # _AM_PROG_TAR
m4_include([acinclude.m4])
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/config.h.in gnome-vfs-2.24.2/config.h.in
---- gnome-vfs-2.24.2.old/config.h.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/config.h.in 2009-10-08 18:37:02.000000000 +0200
+Index: gnome-vfs-2.24.2/config.h.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/config.h.in 2009-10-08 16:19:05.000000000 +0200
++++ gnome-vfs-2.24.2/config.h.in 2010-02-06 11:55:51.437287096 +0100
@@ -400,22 +400,22 @@
/* Define to 1 if struct linger is available */
#undef HAVE_STRUCT_LINGER
@@ -7359,9 +7361,10 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/configure gnome-vfs-2.24.2/configure
---- gnome-vfs-2.24.2.old/configure 2009-10-08 16:18:09.000000000 +0200
-+++ gnome-vfs-2.24.2/configure 2009-10-08 18:37:00.000000000 +0200
+Index: gnome-vfs-2.24.2/configure
+===================================================================
+--- gnome-vfs-2.24.2.orig/configure 2009-10-08 16:18:09.000000000 +0200
++++ gnome-vfs-2.24.2/configure 2010-02-06 11:55:51.509278949 +0100
@@ -1,18 +1,20 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -43228,9 +43231,10 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/daemon/Makefile.in gnome-vfs-2.24.2/daemon/Makefile.in
---- gnome-vfs-2.24.2.old/daemon/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/daemon/Makefile.in 2009-10-08 18:37:03.000000000 +0200
+Index: gnome-vfs-2.24.2/daemon/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/daemon/Makefile.in 2009-10-08 16:19:05.000000000 +0200
++++ gnome-vfs-2.24.2/daemon/Makefile.in 2010-02-06 11:55:51.521276846 +0100
@@ -149,8 +149,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43256,9 +43260,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/devel-docs/gnome-vfs-tutorial/Makefile.in gnome-vfs-2.24.2/devel-docs/gnome-vfs-tutorial/Makefile.in
---- gnome-vfs-2.24.2.old/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-10-08 18:37:03.000000000 +0200
+Index: gnome-vfs-2.24.2/devel-docs/gnome-vfs-tutorial/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/devel-docs/gnome-vfs-tutorial/Makefile.in 2009-10-08 16:19:05.000000000 +0200
++++ gnome-vfs-2.24.2/devel-docs/gnome-vfs-tutorial/Makefile.in 2010-02-06 11:55:51.521276846 +0100
@@ -99,8 +99,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43284,9 +43289,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/devel-docs/Makefile.in gnome-vfs-2.24.2/devel-docs/Makefile.in
---- gnome-vfs-2.24.2.old/devel-docs/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/devel-docs/Makefile.in 2009-10-08 18:37:03.000000000 +0200
+Index: gnome-vfs-2.24.2/devel-docs/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/devel-docs/Makefile.in 2009-10-08 16:19:05.000000000 +0200
++++ gnome-vfs-2.24.2/devel-docs/Makefile.in 2010-02-06 11:55:51.525279870 +0100
@@ -139,8 +139,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43312,9 +43318,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/doc/Makefile.in gnome-vfs-2.24.2/doc/Makefile.in
---- gnome-vfs-2.24.2.old/doc/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/doc/Makefile.in 2009-10-08 18:37:03.000000000 +0200
+Index: gnome-vfs-2.24.2/doc/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/doc/Makefile.in 2009-10-08 16:19:05.000000000 +0200
++++ gnome-vfs-2.24.2/doc/Makefile.in 2010-02-06 11:55:51.525279870 +0100
@@ -106,8 +106,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43473,9 +43480,10 @@
.PHONY : dist-hook-local docs
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/gtk-doc.make gnome-vfs-2.24.2/gtk-doc.make
---- gnome-vfs-2.24.2.old/gtk-doc.make 2009-10-08 16:19:02.000000000 +0200
-+++ gnome-vfs-2.24.2/gtk-doc.make 2009-10-08 18:36:38.000000000 +0200
+Index: gnome-vfs-2.24.2/gtk-doc.make
+===================================================================
+--- gnome-vfs-2.24.2.orig/gtk-doc.make 2009-10-08 16:19:02.000000000 +0200
++++ gnome-vfs-2.24.2/gtk-doc.make 2010-02-06 11:55:51.525279870 +0100
@@ -5,13 +5,13 @@
####################################
@@ -43612,9 +43620,10 @@
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/imported/fnmatch/Makefile.in gnome-vfs-2.24.2/imported/fnmatch/Makefile.in
---- gnome-vfs-2.24.2.old/imported/fnmatch/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/imported/fnmatch/Makefile.in 2009-10-08 18:37:04.000000000 +0200
+Index: gnome-vfs-2.24.2/imported/fnmatch/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/imported/fnmatch/Makefile.in 2009-10-08 16:19:06.000000000 +0200
++++ gnome-vfs-2.24.2/imported/fnmatch/Makefile.in 2010-02-06 11:55:51.529278144 +0100
@@ -123,8 +123,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43640,9 +43649,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/imported/Makefile.in gnome-vfs-2.24.2/imported/Makefile.in
---- gnome-vfs-2.24.2.old/imported/Makefile.in 2009-10-08 16:19:05.000000000 +0200
-+++ gnome-vfs-2.24.2/imported/Makefile.in 2009-10-08 18:37:04.000000000 +0200
+Index: gnome-vfs-2.24.2/imported/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/imported/Makefile.in 2009-10-08 16:19:05.000000000 +0200
++++ gnome-vfs-2.24.2/imported/Makefile.in 2010-02-06 11:55:51.529278144 +0100
@@ -139,8 +139,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43668,9 +43678,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/imported/neon/Makefile.in gnome-vfs-2.24.2/imported/neon/Makefile.in
---- gnome-vfs-2.24.2.old/imported/neon/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/imported/neon/Makefile.in 2009-10-08 18:37:04.000000000 +0200
+Index: gnome-vfs-2.24.2/imported/neon/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/imported/neon/Makefile.in 2009-10-08 16:19:06.000000000 +0200
++++ gnome-vfs-2.24.2/imported/neon/Makefile.in 2010-02-06 11:55:51.529278144 +0100
@@ -134,8 +134,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43696,9 +43707,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/libgnomevfs/Makefile.in gnome-vfs-2.24.2/libgnomevfs/Makefile.in
---- gnome-vfs-2.24.2.old/libgnomevfs/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/libgnomevfs/Makefile.in 2009-10-08 18:37:04.000000000 +0200
+Index: gnome-vfs-2.24.2/libgnomevfs/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/libgnomevfs/Makefile.in 2009-10-08 16:19:06.000000000 +0200
++++ gnome-vfs-2.24.2/libgnomevfs/Makefile.in 2010-02-06 11:55:51.529278144 +0100
@@ -235,8 +235,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43724,9 +43736,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/ltmain.sh gnome-vfs-2.24.2/ltmain.sh
---- gnome-vfs-2.24.2.old/ltmain.sh 2009-10-08 16:19:02.000000000 +0200
-+++ gnome-vfs-2.24.2/ltmain.sh 2009-10-08 18:36:51.000000000 +0200
+Index: gnome-vfs-2.24.2/ltmain.sh
+===================================================================
+--- gnome-vfs-2.24.2.orig/ltmain.sh 2009-10-08 16:19:02.000000000 +0200
++++ gnome-vfs-2.24.2/ltmain.sh 2010-02-06 11:55:51.537282236 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -43805,9 +43818,10 @@
esac
;;
no)
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/Makefile.in gnome-vfs-2.24.2/Makefile.in
---- gnome-vfs-2.24.2.old/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/Makefile.in 2009-10-08 18:37:05.000000000 +0200
+Index: gnome-vfs-2.24.2/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/Makefile.in 2009-10-08 16:19:06.000000000 +0200
++++ gnome-vfs-2.24.2/Makefile.in 2010-02-06 11:55:51.541280511 +0100
@@ -183,8 +183,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43833,9 +43847,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/modules/Makefile.in gnome-vfs-2.24.2/modules/Makefile.in
---- gnome-vfs-2.24.2.old/modules/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/modules/Makefile.in 2009-10-08 18:37:04.000000000 +0200
+Index: gnome-vfs-2.24.2/modules/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/modules/Makefile.in 2009-10-08 16:19:06.000000000 +0200
++++ gnome-vfs-2.24.2/modules/Makefile.in 2010-02-06 11:55:51.541280511 +0100
@@ -271,8 +271,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43861,9 +43876,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/programs/Makefile.in gnome-vfs-2.24.2/programs/Makefile.in
---- gnome-vfs-2.24.2.old/programs/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/programs/Makefile.in 2009-10-08 18:37:05.000000000 +0200
+Index: gnome-vfs-2.24.2/programs/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/programs/Makefile.in 2009-10-08 16:19:06.000000000 +0200
++++ gnome-vfs-2.24.2/programs/Makefile.in 2010-02-06 11:55:51.545279903 +0100
@@ -161,8 +161,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43889,9 +43905,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/schemas/Makefile.in gnome-vfs-2.24.2/schemas/Makefile.in
---- gnome-vfs-2.24.2.old/schemas/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/schemas/Makefile.in 2009-10-08 18:37:05.000000000 +0200
+Index: gnome-vfs-2.24.2/schemas/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/schemas/Makefile.in 2009-10-08 16:19:06.000000000 +0200
++++ gnome-vfs-2.24.2/schemas/Makefile.in 2010-02-06 11:55:51.545279903 +0100
@@ -123,8 +123,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
@@ -43917,9 +43934,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-diff -x'*INSTALL' -Naur gnome-vfs-2.24.2.old/test/Makefile.in gnome-vfs-2.24.2/test/Makefile.in
---- gnome-vfs-2.24.2.old/test/Makefile.in 2009-10-08 16:19:06.000000000 +0200
-+++ gnome-vfs-2.24.2/test/Makefile.in 2009-10-08 18:37:05.000000000 +0200
+Index: gnome-vfs-2.24.2/test/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.2.orig/test/Makefile.in 2009-10-08 16:19:06.000000000 +0200
++++ gnome-vfs-2.24.2/test/Makefile.in 2010-02-06 11:55:51.549280971 +0100
@@ -286,8 +286,6 @@
GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
GSSAPI_LIBS = @GSSAPI_LIBS@
Modified: desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch?rev=22984&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch [utf-8] Sat Feb 6 10:59:14 2010
@@ -1,9 +1,9 @@
-Index: nautilus-2.18.1/ltmain.sh
+Index: gnome-vfs-2.24.2/ltmain.sh
===================================================================
---- nautilus-2.18.1.orig/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/ltmain.sh 2007-06-06 23:36:38.899175453 +0200
-@@ -1794,6 +1794,11 @@
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- gnome-vfs-2.24.2.orig/ltmain.sh 2010-02-06 11:55:51.537282236 +0100
++++ gnome-vfs-2.24.2/ltmain.sh 2010-02-06 11:55:52.549279295 +0100
+@@ -4716,6 +4716,11 @@
+ arg=$func_stripname_result
;;
+ -Wl,--as-needed)
@@ -12,9 +12,9 @@
+ ;;
+
-Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- arg=
-@@ -2134,6 +2139,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -5070,6 +5075,15 @@
lib=
found=no
case $deplib in
More information about the pkg-gnome-commits
mailing list