r10733 - in /desktop/unstable/gnome-vfs2/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu May 3 21:36:31 UTC 2007
Author: joss
Date: Thu May 3 21:36:30 2007
New Revision: 10733
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10733
Log:
* Convert to quilt for patch handling, build-depend on quilt.
* Convert all patches to -p1 and refresh them.
* 06_blacklist-directories.patch: add a few commonly found
non-toplevel FHS direcories to the mountpoint blacklist.
Closes: #365670.
Added:
desktop/unstable/gnome-vfs2/debian/patches/06_blacklist-directories.patch
desktop/unstable/gnome-vfs2/debian/patches/series
Modified:
desktop/unstable/gnome-vfs2/debian/changelog
desktop/unstable/gnome-vfs2/debian/control
desktop/unstable/gnome-vfs2/debian/control.in
desktop/unstable/gnome-vfs2/debian/patches/01_fstab_edit_crash.patch
desktop/unstable/gnome-vfs2/debian/patches/02_audiocd_readonly.patch
desktop/unstable/gnome-vfs2/debian/patches/03_usr_share_gnome_applications.patch
desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch
desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch
desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch
desktop/unstable/gnome-vfs2/debian/patches/09_gnomevfs_mount_selection.patch
desktop/unstable/gnome-vfs2/debian/patches/10_configuration_loop.patch
desktop/unstable/gnome-vfs2/debian/patches/12_user_visible_drives.patch
desktop/unstable/gnome-vfs2/debian/patches/13_resolve_fstab_symlinks.patch
desktop/unstable/gnome-vfs2/debian/patches/19_hurd_path_max.patch
desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch
desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch
desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch
desktop/unstable/gnome-vfs2/debian/rules
Modified: desktop/unstable/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/changelog?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/changelog (original)
+++ desktop/unstable/gnome-vfs2/debian/changelog Thu May 3 21:36:30 2007
@@ -1,11 +1,19 @@
-gnome-vfs2 (1:2.18.1-2) UNRELEASED; urgency=low
-
+gnome-vfs2 (1:2.18.1-2) unstable; urgency=low
+
+ [ Loic Minier ]
* Wrap build-deps and deps.
* Drop libc6-dev dep.
* Make the build-dep on libdbus-glib-1-dev unconditional; thanks
Michael Banck; closes: #419860.
- -- Loic Minier <lool at dooz.org> Wed, 18 Apr 2007 13:07:43 +0200
+ [ Josselin Mouette ]
+ * Convert to quilt for patch handling, build-depend on quilt.
+ * Convert all patches to -p1 and refresh them.
+ * 06_blacklist-directories.patch: add a few commonly found
+ non-toplevel FHS direcories to the mountpoint blacklist.
+ Closes: #365670.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 03 May 2007 23:14:05 +0200
gnome-vfs2 (1:2.18.1-1) unstable; urgency=low
Modified: desktop/unstable/gnome-vfs2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/control?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/control (original)
+++ desktop/unstable/gnome-vfs2/debian/control Thu May 3 21:36:30 2007
@@ -4,6 +4,7 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs,
+ quilt,
type-handling,
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.9.3),
Modified: desktop/unstable/gnome-vfs2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/control.in?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/control.in (original)
+++ desktop/unstable/gnome-vfs2/debian/control.in Thu May 3 21:36:30 2007
@@ -4,6 +4,7 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
+ quilt,
type-handling,
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.9.3),
Modified: desktop/unstable/gnome-vfs2/debian/patches/01_fstab_edit_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/01_fstab_edit_crash.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/01_fstab_edit_crash.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/01_fstab_edit_crash.patch Thu May 3 21:36:30 2007
@@ -1,9 +1,10 @@
# upstream http://bugzilla.gnome.org/show_bug.cgi?id=300547
-diff -Nur gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
---- gnome-vfs2-2.10.0/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2004-12-14 17:23:33.000000000 +0100
-+++ gnome-vfs2-2.10.0.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2005-03-17 12:01:07.245801992 +0100
-@@ -718,6 +718,9 @@
+Index: gnome-vfs-2.18.1/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 @@
mount = l->data;
uri = gnome_vfs_get_uri_from_local_path (mount->mount_path);
Modified: desktop/unstable/gnome-vfs2/debian/patches/02_audiocd_readonly.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/02_audiocd_readonly.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/02_audiocd_readonly.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/02_audiocd_readonly.patch Thu May 3 21:36:30 2007
@@ -1,6 +1,8 @@
---- libgnomevfs/gnome-vfs-hal-mounts.c.orig 2006-12-09 01:14:31.000000000 +0100
-+++ libgnomevfs/gnome-vfs-hal-mounts.c 2006-12-09 01:35:07.000000000 +0100
-@@ -1036,17 +1036,19 @@
+Index: gnome-vfs-2.18.1/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
+@@ -1038,17 +1038,19 @@
vol->priv->volume_type = GNOME_VFS_VOLUME_TYPE_VFS_MOUNT;
vol->priv->activation_uri = g_strdup_printf ("cdda://%s",
libhal_volume_get_device_file (hal_volume));
Modified: desktop/unstable/gnome-vfs2/debian/patches/03_usr_share_gnome_applications.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/03_usr_share_gnome_applications.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/03_usr_share_gnome_applications.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/03_usr_share_gnome_applications.patch Thu May 3 21:36:30 2007
@@ -1,6 +1,8 @@
---- libgnomevfs/gnome-vfs-mime-info-cache.c.orig 2005-03-22 19:47:02.000000000 +0100
-+++ libgnomevfs/gnome-vfs-mime-info-cache.c 2005-03-22 19:59:32.000000000 +0100
-@@ -412,11 +412,12 @@
+Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-mime-info-cache.c
+===================================================================
+--- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-mime-info-cache.c 2007-04-10 14:03:59.000000000 +0200
++++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-mime-info-cache.c 2007-05-03 23:00:18.131365250 +0200
+@@ -424,11 +424,12 @@
for (length = 0; data_dirs[length] != NULL; length++);
Modified: desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/04_sftp_pam_krb5.patch Thu May 3 21:36:30 2007
@@ -1,11 +1,13 @@
---- modules/sftp-method.c.orig 2006-07-21 19:13:29.000000000 +0200
-+++ modules/sftp-method.c 2007-02-28 18:27:29.000000000 +0100
-@@ -1273,6 +1273,8 @@
+Index: gnome-vfs-2.18.1/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
+@@ -1315,6 +1315,8 @@
if (g_str_has_suffix (buffer, "password: ") ||
g_str_has_suffix (buffer, "Password: ") ||
g_str_has_suffix (buffer, "Password:") ||
+ g_str_has_prefix (buffer, "Password for ") ||
+ g_str_has_prefix (buffer, "Enter Kerberos password") ||
g_str_has_prefix (buffer, "Enter passphrase for key")) {
- if (!done_auth && gnome_vfs_uri_get_password (uri) != NULL) {
- password = g_strdup (gnome_vfs_uri_get_password (uri));
+ if (!done_auth && password != NULL) {
+ g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);
Modified: desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/05_default_modules.patch Thu May 3 21:36:30 2007
@@ -1,5 +1,7 @@
---- modules/default-modules.conf.orig 2006-09-06 22:27:34.000000000 +0200
-+++ modules/default-modules.conf 2007-02-24 10:45:30.000000000 +0100
+Index: gnome-vfs-2.18.1/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
@@ -6,8 +6,6 @@
# <method 1> <method 2> ... <method N> : <module>
#
Added: desktop/unstable/gnome-vfs2/debian/patches/06_blacklist-directories.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/06_blacklist-directories.patch?rev=10733&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/06_blacklist-directories.patch (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/06_blacklist-directories.patch Thu May 3 21:36:30 2007
@@ -1,0 +1,17 @@
+Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c
+===================================================================
+--- 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,6 +645,12 @@
+ "/var",
+ "/proc",
+ "/sbin",
++ "/usr/local",
++ "/var/local",
++ "/var/crash",
++ "/var/mail",
++ "/var/run",
++ "/var/tmp",
+ NULL
+ };
+
Modified: desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/08_recursive_local_check.patch Thu May 3 21:36:30 2007
@@ -1,6 +1,8 @@
---- modules/file-method.c.orig 2006-08-23 13:19:26.000000000 +0200
-+++ modules/file-method.c 2006-09-06 22:19:02.000000000 +0200
-@@ -1258,6 +1258,7 @@
+Index: gnome-vfs-2.18.1/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
+@@ -1257,6 +1257,7 @@
struct stat statbuf;
gboolean is_local;
gchar *path;
@@ -8,7 +10,7 @@
g_return_val_if_fail (uri != NULL, FALSE);
-@@ -1265,21 +1266,22 @@
+@@ -1264,21 +1265,22 @@
if (path == NULL)
return TRUE; /* GNOME_VFS_ERROR_INVALID_URI */
Modified: desktop/unstable/gnome-vfs2/debian/patches/09_gnomevfs_mount_selection.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/09_gnomevfs_mount_selection.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/09_gnomevfs_mount_selection.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/09_gnomevfs_mount_selection.patch Thu May 3 21:36:30 2007
@@ -1,12 +1,9 @@
? libgnomevfs/.gnome-vfs-volume-ops.c.swp
-Index: libgnomevfs/gnome-vfs-volume-ops.c
+Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-volume-ops.c
===================================================================
-RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-volume-ops.c,v
-retrieving revision 1.31
-diff -u -r1.31 gnome-vfs-volume-ops.c
---- libgnomevfs/gnome-vfs-volume-ops.c 25 Apr 2006 11:19:53 -0000 1.31
-+++ libgnomevfs/gnome-vfs-volume-ops.c 1 May 2006 17:29:27 -0000
-@@ -833,8 +833,6 @@
+--- 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
+@@ -823,8 +823,6 @@
# if defined(HAL_MOUNT)
if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE))
command = HAL_MOUNT;
@@ -15,7 +12,7 @@
# else
;
# endif
-@@ -857,8 +855,6 @@
+@@ -847,8 +845,6 @@
# if defined(HAL_UMOUNT)
if (hal_udi != NULL && g_file_test (HAL_UMOUNT, G_FILE_TEST_IS_EXECUTABLE))
command = HAL_UMOUNT;
Modified: desktop/unstable/gnome-vfs2/debian/patches/10_configuration_loop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/10_configuration_loop.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/10_configuration_loop.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/10_configuration_loop.patch Thu May 3 21:36:30 2007
@@ -1,5 +1,7 @@
---- libgnomevfs/gnome-vfs-configuration.c.orig 2006-09-01 23:52:57.000000000 +0200
-+++ libgnomevfs/gnome-vfs-configuration.c 2006-09-01 23:55:31.000000000 +0200
+Index: gnome-vfs-2.18.1/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
@@ -358,6 +358,8 @@
guint line_buffer_size;
guint line_number;
Modified: desktop/unstable/gnome-vfs2/debian/patches/12_user_visible_drives.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/12_user_visible_drives.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/12_user_visible_drives.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/12_user_visible_drives.patch Thu May 3 21:36:30 2007
@@ -1,8 +1,9 @@
Nur in gnome-vfs2-2.8.1.old/debian/patches: 12_user_visible_drives.patch.
-diff -ru gnome-vfs2-2.8.1.old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.8.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
---- gnome-vfs2-2.8.1.old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2004-09-23 15:20:46.099901960 +0200
-+++ gnome-vfs2-2.8.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2004-09-23 15:23:00.649447320 +0200
-@@ -954,6 +954,10 @@
+Index: gnome-vfs-2.18.1/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 @@
vol->priv->is_user_visible = 1;
break;
default:
Modified: desktop/unstable/gnome-vfs2/debian/patches/13_resolve_fstab_symlinks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/13_resolve_fstab_symlinks.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/13_resolve_fstab_symlinks.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/13_resolve_fstab_symlinks.patch Thu May 3 21:36:30 2007
@@ -1,7 +1,8 @@
-diff -Nur gnome-vfs2-2.8.3/libgnomevfs/gnome-vfs-unix-mounts.c gnome-vfs2-2.8.3.new/libgnomevfs/gnome-vfs-unix-mounts.c
---- gnome-vfs2-2.8.3/libgnomevfs/gnome-vfs-unix-mounts.c 2004-10-15 10:00:02.000000000 +0200
-+++ gnome-vfs2-2.8.3.new/libgnomevfs/gnome-vfs-unix-mounts.c 2004-11-23 17:19:09.426568360 +0100
-@@ -538,6 +538,7 @@
+Index: gnome-vfs-2.18.1/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
+@@ -541,6 +541,7 @@
char *opt, *opt_end;
struct stat sb;
GnomeVFSUnixMountPoint *mount_entry;
@@ -9,7 +10,7 @@
stat_file = read_file = get_fstab_file ();
-@@ -569,7 +570,12 @@
+@@ -572,7 +573,12 @@
mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
Modified: desktop/unstable/gnome-vfs2/debian/patches/19_hurd_path_max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/19_hurd_path_max.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/19_hurd_path_max.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/19_hurd_path_max.patch Thu May 3 21:36:30 2007
@@ -1,5 +1,7 @@
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig 2005-03-24 15:49:19.000000000 +0100
-+++ libgnomevfs/gnome-vfs-unix-mounts.c 2005-03-24 15:49:55.000000000 +0100
+Index: gnome-vfs-2.18.1/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
@@ -85,6 +85,9 @@
#define STAT_TIMEOUT_SECONDS 3
@@ -10,9 +12,11 @@
/* Ideally this should not nonblocking stat, since that can block on
* downed NFS mounts forever, however there seems to be no good way
---- modules/file-method.c.orig 2005-04-01 02:24:13.000000000 +0200
-+++ modules/file-method.c 2005-04-01 02:23:33.000000000 +0200
-@@ -87,7 +87,11 @@
+Index: gnome-vfs-2.18.1/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
+@@ -127,7 +127,11 @@
if (x > 0)
value = x;
else
@@ -24,7 +28,7 @@
}
return value;
-@@ -1357,7 +1357,7 @@
+@@ -1659,7 +1663,7 @@
char *cache_file_path;
FILE *cache_file;
char buffer[2048];
Modified: desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/20_dont_register_keys_for_gaim.patch Thu May 3 21:36:30 2007
@@ -1,7 +1,8 @@
-diff -Nur gnome-vfs2-2.16.3/schemas/desktop_gnome_url_handlers.schemas.in gnome-vfs2-2.16.3.new/schemas/desktop_gnome_url_handlers.schemas.in
---- gnome-vfs2-2.16.3/schemas/desktop_gnome_url_handlers.schemas.in 2006-12-07 12:01:26.000000000 +0100
-+++ gnome-vfs2-2.16.3.new/schemas/desktop_gnome_url_handlers.schemas.in 2006-12-07 12:02:01.000000000 +0100
-@@ -274,40 +274,6 @@
+Index: gnome-vfs-2.18.1/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 @@
</schema>
<schema>
Modified: desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/22_ignore_inaccessible_volumes.patch Thu May 3 21:36:30 2007
@@ -1,7 +1,8 @@
-diff -Nur gnome-vfs2-2.15.92/libgnomevfs/gnome-vfs-hal-mounts.c gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-hal-mounts.c
---- gnome-vfs2-2.15.92/libgnomevfs/gnome-vfs-hal-mounts.c 2006-08-22 10:40:05.000000000 +0200
-+++ gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-hal-mounts.c 2006-08-22 10:42:53.000000000 +0200
-@@ -39,6 +39,7 @@
+Index: gnome-vfs-2.18.1/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
+@@ -41,6 +41,7 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
@@ -9,7 +10,7 @@
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libhal.h>
-@@ -699,6 +700,10 @@
+@@ -690,6 +691,10 @@
mount_point = libhal_volume_get_mount_point (hal_volume);
/* blacklist fhs2.3 top level mount points */
if (mount_point != NULL) {
@@ -20,9 +21,10 @@
for (i = 0; fhs23_toplevel_mount_points[i] != NULL; i++) {
if (strcmp (mount_point, fhs23_toplevel_mount_points[i]) == 0)
goto out;
-diff -Nur gnome-vfs2-2.15.92/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
---- gnome-vfs2-2.15.92/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2006-08-22 10:40:04.000000000 +0200
-+++ gnome-vfs2-2.15.92.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2006-08-22 10:48:11.000000000 +0200
+Index: gnome-vfs-2.18.1/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
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <libgnomevfs/gnome-vfs-utils.h>
Modified: desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/30_nfs4.patch Thu May 3 21:36:30 2007
@@ -1,7 +1,8 @@
-diff -Nur gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-filesystem-type.c
---- gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-filesystem-type.c 2005-07-18 14:29:56.000000000 +0200
-+++ gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-filesystem-type.c 2007-03-12 17:23:34.000000000 +0100
-@@ -57,6 +57,7 @@
+Index: gnome-vfs-2.18.1/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 @@
{ "msdos" , N_("MSDOS Volume"), 0 },
{ "msdosfs" , N_("MSDOS Volume"), 0 },
{ "nfs" , N_("NFS Network Volume"), 1 },
@@ -9,10 +10,11 @@
{ "ntfs" , N_("Windows NT Volume"), 0 },
{ "nwfs" , N_("Netware Volume"), 0 },
{ "proc" , N_("System Volume"), 0 },
-diff -Nur gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
---- gnome-vfs2-2.14.2/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-03-12 17:23:33.000000000 +0100
-+++ gnome-vfs2-2.14.2.new/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2007-03-12 17:23:34.000000000 +0100
-@@ -891,7 +891,8 @@
+Index: gnome-vfs-2.18.1/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 @@
if (vol->priv->device_type == GNOME_VFS_DEVICE_TYPE_UNKNOWN) {
vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_CDROM;
}
@@ -22,9 +24,10 @@
if (strstr (vol->priv->device_path, "(pid") != NULL) {
vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_AUTOFS;
} else {
-diff -Nur gnome-vfs2-2.14.2/modules/file-method.c gnome-vfs2-2.14.2.new/modules/file-method.c
---- gnome-vfs2-2.14.2/modules/file-method.c 2007-03-12 17:23:33.000000000 +0100
-+++ gnome-vfs2-2.14.2.new/modules/file-method.c 2007-03-12 17:24:44.000000000 +0100
+Index: gnome-vfs-2.18.1/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
@@ -1279,6 +1279,7 @@
G_LOCK (fstype);
type = filesystem_type (path, path, &statbuf);
Added: desktop/unstable/gnome-vfs2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/series?rev=10733&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/series (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/series Thu May 3 21:36:30 2007
@@ -1,0 +1,15 @@
+01_fstab_edit_crash.patch
+02_audiocd_readonly.patch
+03_usr_share_gnome_applications.patch
+04_sftp_pam_krb5.patch
+05_default_modules.patch
+06_blacklist-directories.patch
+08_recursive_local_check.patch
+09_gnomevfs_mount_selection.patch
+10_configuration_loop.patch
+12_user_visible_drives.patch
+13_resolve_fstab_symlinks.patch
+19_hurd_path_max.patch
+20_dont_register_keys_for_gaim.patch
+22_ignore_inaccessible_volumes.patch
+30_nfs4.patch
Modified: desktop/unstable/gnome-vfs2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/rules?rev=10733&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/rules (original)
+++ desktop/unstable/gnome-vfs2/debian/rules Thu May 3 21:36:30 2007
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
More information about the pkg-gnome-commits
mailing list