r16058 - in /desktop/unstable/gnome-vfs/debian: changelog defaults.list patches/07_trash_location.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed May 28 00:08:39 UTC 2008
Author: joss
Date: Wed May 28 00:08:38 2008
New Revision: 16058
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16058
Log:
* defaults.list: update to the 2.22 applications capabilities.
* 07_trash_location.patch: new patch. Make gnome-vfs return the new
location for the trash. Beware, it is NOT conforming to the
specification, especially it doesn’t create the .trashinfo files.
However nautilus 2.22 is backwards-compatible with this behavior.
Added:
desktop/unstable/gnome-vfs/debian/patches/07_trash_location.patch
Modified:
desktop/unstable/gnome-vfs/debian/changelog
desktop/unstable/gnome-vfs/debian/defaults.list
desktop/unstable/gnome-vfs/debian/patches/series
Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=16058&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog (original)
+++ desktop/unstable/gnome-vfs/debian/changelog Wed May 28 00:08:38 2008
@@ -1,3 +1,13 @@
+gnome-vfs (1:2.22.0-3) unstable; urgency=low
+
+ * defaults.list: update to the 2.22 applications capabilities.
+ * 07_trash_location.patch: new patch. Make gnome-vfs return the new
+ location for the trash. Beware, it is NOT conforming to the
+ specification, especially it doesn’t create the .trashinfo files.
+ However nautilus 2.22 is backwards-compatible with this behavior.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 28 May 2008 01:46:46 +0200
+
gnome-vfs (1:2.22.0-2) unstable; urgency=low
* debian/patches/90_from_svn_no_range_for_youtube.patch:
Modified: desktop/unstable/gnome-vfs/debian/defaults.list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/defaults.list?rev=16058&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/defaults.list (original)
+++ desktop/unstable/gnome-vfs/debian/defaults.list Wed May 28 00:08:38 2008
@@ -28,6 +28,7 @@
image/x-portable-pixmap=eog.desktop
image/x-xbitmap=eog.desktop
image/x-xpixmap=eog.desktop
+image/vnd.wap.wbmp=eog.desktop
image/g3fax=gimp.desktop
image/x-compressed-xcf=gimp.desktop
image/x-fits=gimp.desktop
@@ -50,6 +51,8 @@
image/x-bzeps=evince.desktop
image/x-gzeps=evince.desktop
application/x-dvi=evince.desktop
+application/x-bzdvi=evince.desktop
+application/x-gzdvi=evince.desktop
image/vnd.djvu=evince.desktop
application/x-cbr=evince.desktop
application/x-cbz=evince.desktop
@@ -61,6 +64,7 @@
application/x-cd-image=file-roller.desktop
application/x-compress=file-roller.desktop
application/x-compressed-tar=file-roller.desktop
+application/x-cpio=file-roller.desktop
application/x-deb=file-roller.desktop
application/x-ear=file-roller.desktop
application/x-gtar=file-roller.desktop
@@ -69,6 +73,8 @@
application/x-java-archive=file-roller.desktop
application/x-lha=file-roller.desktop
application/x-lhz=file-roller.desktop
+application/x-lzma=file-roller.desktop
+application/x-lzma-compressed-tar=file-roller.desktop
application/x-lzop=file-roller.desktop
application/x-rar=file-roller.desktop
application/x-rar-compressed=file-roller.desktop
@@ -146,6 +152,7 @@
application/wordperfect=ooo-writer.desktop
application/ogg=totem.desktop
application/ram=totem.desktop
+application/sdp=totem.desktop
application/smil=totem.desktop
application/vnd.rn-realmedia=totem.desktop
application/x-extension-m4a=totem.desktop
@@ -153,10 +160,10 @@
application/x-flac=totem.desktop
application/x-flash-video=totem.desktop
application/x-matroska=totem.desktop
+application/x-netshow-channel=totem.desktop
application/x-ogg=totem.desktop
application/x-quicktime-media-link=totem.desktop
application/x-quicktimeplayer=totem.desktop
-application/x-shockwave-flash=totem.desktop
application/x-shorten=totem.desktop
application/x-smil=totem.desktop
application/xspf+xml=totem.desktop
@@ -168,6 +175,7 @@
audio/mp4=totem.desktop
audio/mpeg=totem.desktop
audio/mpegurl=totem.desktop
+audio/ogg=totem.desktop
audio/vnd.rn-realaudio=totem.desktop
audio/x-ape=totem.desktop
audio/x-flac=totem.desktop
@@ -191,8 +199,11 @@
audio/x-pn-windows-acm=totem.desktop
audio/x-realaudio=totem.desktop
audio/x-real-audio=totem.desktop
+audio/x-sbc=totem.desktop
audio/x-scpls=totem.desktop
+audio/x-speex=totem.desktop
audio/x-tta=totem.desktop
+audio/x-vorbis=totem.desktop
audio/x-wav=totem.desktop
audio/x-wavpack=totem.desktop
image/vnd.rn-realpix=totem.desktop
Added: 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=16058&op=file
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/07_trash_location.patch (added)
+++ desktop/unstable/gnome-vfs/debian/patches/07_trash_location.patch Wed May 28 00:08:38 2008
@@ -1,0 +1,29 @@
+Index: gnome-vfs-2.22.0/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)
+ char *per_user_part;
+ char *retval;
+
+- per_user_part = g_strconcat (TRASH_DIRECTORY_NAME_BASE "-",
+- g_get_user_name (),
+- NULL);
++ per_user_part = g_strdup_printf ("%s-%lu",
++ TRASH_DIRECTORY_NAME_BASE,
++ (unsigned long) geteuid());
+
+- retval = g_build_filename (path, per_user_part, NULL);
++ retval = g_build_filename (path, per_user_part, "files", NULL);
+
+ g_free (per_user_part);
+
+@@ -1993,7 +1993,7 @@ do_find_directory (GnomeVFSMethod *metho
+ }
+ } else {
+ /* volume with a home directory, just create a trash in home */
+- target_directory_path = append_to_path (home_directory, TRASH_DIRECTORY_NAME_BASE);
++ target_directory_path = g_build_filename (g_get_user_data_dir (), "Trash", "files", NULL);
+ }
+ break;
+
Modified: desktop/unstable/gnome-vfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/series?rev=16058&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/series (original)
+++ desktop/unstable/gnome-vfs/debian/patches/series Wed May 28 00:08:38 2008
@@ -4,6 +4,7 @@
04_sftp_pam_krb5.patch
05_default_modules.patch
06_blacklist-directories.patch
+07_trash_location.patch
08_recursive_local_check.patch
09_gnomevfs_mount_selection.patch
10_configuration_loop.patch
More information about the pkg-gnome-commits
mailing list