Package: gnome-vfs
Version: 1:2.22.0-5
Severity: normal

gnome-vfs is missing filesystems, causing the trash on those devices to
not behave correctly. The attached patch adds some of them, but may need
some cleanup before uploaded. It should work for the version in unstable
as well.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (350, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- 
Julian Andres Klode  - Free Software Developer
   Debian Developer  - Contributing Member of SPI
   Ubuntu Member     - Fellow of FSFE

Website: http://jak-linux.org/   XMPP: [email protected]
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 <[email protected]>
-Uploaders: Debian GNOME Maintainers <[email protected]>, Sebastian Dröge <[email protected]>
+Uploaders: Debian GNOME Maintainers <[email protected]>, Julian Andres Klode <[email protected]>, Sebastian Dröge <[email protected]>
 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 <[email protected]>  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 },

Reply via email to