[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[stable] gnome-vfs update for point release (non-working trash)?



Hi,

gnome-vfs as currently in stable is missing filesystems like
ext4 from its list of filesystems, causing the trash not to
work correctly on stable, as seen in Bug#511071.[1]

The attached patch adds the filesystems 'btrfs', 'ext4dev',
'ext4' and 'ntfs-3g' to the list of filesystems supporting the
trash.

Is this patch a valid candidate for inclusion in the next point
release? 

Regards,
Julian

[1] unstable's version of gnome-vfs is affected as well, but this
    is not an important issue because nautilus uses gvfs nowadays.
-- 
Julian Andres Klode  - Free Software Developer
   Debian Developer  - Contributing Member of SPI
   Ubuntu Member     - Fellow of FSFE

Website: http://jak-linux.org/   XMPP: juliank@jabber.org
Debian:  http://www.debian.org/  SPI:  http://www.spi-inc.org/
Ubuntu:  http://www.ubuntu.com/  FSFE: http://www.fsfe.org/
diff -u gnome-vfs-2.22.0/debian/control gnome-vfs-2.22.0/debian/control
--- gnome-vfs-2.22.0/debian/control
+++ gnome-vfs-2.22.0/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Julian Andres Klode <jak@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: cdbs,
                quilt,
                type-handling,
diff -u gnome-vfs-2.22.0/debian/changelog gnome-vfs-2.22.0/debian/changelog
--- gnome-vfs-2.22.0/debian/changelog
+++ gnome-vfs-2.22.0/debian/changelog
@@ -1,3 +1,9 @@
+gnome-vfs (1:2.22.0-5jak1) stable; urgency=low
+
+  * 25_new_filesystems.patch: Support trash on ext4dev, ext4, btrfs.
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 28 Jul 2009 14:34:10 +0200
+
 gnome-vfs (1:2.22.0-5) unstable; urgency=low
 
   * Recommend dbus-x11 for the availability of dbus-launch.
diff -u gnome-vfs-2.22.0/debian/patches/series gnome-vfs-2.22.0/debian/patches/series
--- gnome-vfs-2.22.0/debian/patches/series
+++ gnome-vfs-2.22.0/debian/patches/series
@@ -19,6 +19,7 @@
 22_ignore_inaccessible_volumes.patch
 23_improve_volume_labels.patch
 24_home_dir_fakeroot.patch
+25_new_filesystems.patch
 30_nfs4.patch
 90_from_svn_no_range_for_youtube.patch
 99_ltmain_as-needed.patch
only in patch2:
unchanged:
--- gnome-vfs-2.22.0.orig/debian/patches/25_new_filesystems.patch
+++ gnome-vfs-2.22.0/debian/patches/25_new_filesystems.patch
@@ -0,0 +1,27 @@
+--- a/libgnomevfs/gnome-vfs-filesystem-type.c
++++ b/libgnomevfs/gnome-vfs-filesystem-type.c
+@@ -39,6 +39,7 @@ static struct FSInfo fs_data[] = {
+ 	{ "affs"     , N_("AFFS Volume"), 0},
+ 	{ "afs"      , N_("AFS Network Volume"), 0 },
+ 	{ "auto"     , N_("Auto-detected Volume"), 0 },
++        { "btrfs"    , N_("BTRFS Linux Volume"), 1},
+ 	{ "cd9660"   , N_("CD-ROM Drive"), 0 },
+ 	{ "cdda"     , N_("CD Digital Audio"), 0 },
+ 	{ "cdrom"    , N_("CD-ROM Drive"), 0 },
+@@ -47,6 +48,8 @@ static struct FSInfo fs_data[] = {
+ 	{ "ext2"     , N_("Ext2 Linux Volume"), 1 },
+ 	{ "ext2fs"   , N_("Ext2 Linux Volume"), 1 },
+ 	{ "ext3"     , N_("Ext3 Linux Volume"), 1 },
++        { "ext4dev"  , N_("Ext4 (Development Version) Linux Volume"), 1 },
++        { "ext4"     , N_("Ext4 Linux Volume"), 1 },
+ 	{ "fat"      , N_("MSDOS Volume"), 1 },
+ 	{ "ffs"      , N_("BSD Volume"), 1 },
+ 	{ "fuse"     , N_("FUSE Volume"), 1 },
+@@ -65,6 +68,7 @@ static struct FSInfo fs_data[] = {
+ 	{ "msdosfs"  , N_("MSDOS Volume"), 0 },
+ 	{ "nfs"      , N_("NFS Network Volume"), 1 },
+ 	{ "ntfs"     , N_("Windows NT Volume"), 0 },
++	{ "ntfs-3g"  , N_("Windows NT Volume"), 1 },
+ 	{ "nwfs"     , N_("Netware Volume"), 0 },
+ 	{ "proc"     , N_("System Volume"), 0 },
+ 	{ "procfs"   , N_("System Volume"), 0 },

Attachment: signature.asc
Description: Digital signature


Reply to: