r16060 - in /desktop/unstable/gnome-session/debian: changelog patches/04_trash_link.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed May 28 00:10:19 2008
New Revision: 16060

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16060
Log:
* New upstream release, includes migration of the trash to the new 
  location.
* 04_trash_link.patch: new patch. Disable the .trashinfo file 
  generation until nautilus in unstable is able to use them.

Added:
    desktop/unstable/gnome-session/debian/patches/04_trash_link.patch
Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/series

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=16060&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Wed May 28 00:10:19 2008
@@ -1,14 +1,19 @@
-gnome-session (2.22.1-1) UNRELEASED; urgency=low
+gnome-session (2.22.2-1) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Drop dependency on gnome-power-manager. Closes: #472202.
 
   [ Sam Morris ]
-  * New upstream release.
   * Refresh 01_ignore-gdm-lang.patch, 02_gsd-spawn.patch, 09_splash_hide.patch
     and 90_autoconf-autoheader.patch.
 
- -- Sam Morris <sam at robots.org.uk>  Wed, 07 May 2008 00:54:14 +0100
+  [ Josselin Mouette ]
+  * New upstream release, includes migration of the trash to the new 
+    location.
+  * 04_trash_link.patch: new patch. Disable the .trashinfo file 
+    generation until nautilus in unstable is able to use them.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 28 May 2008 02:10:26 +0200
 
 gnome-session (2.22.0-2) unstable; urgency=low
 

Added: desktop/unstable/gnome-session/debian/patches/04_trash_link.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/04_trash_link.patch?rev=16060&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/04_trash_link.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/04_trash_link.patch Wed May 28 00:10:19 2008
@@ -1,0 +1,35 @@
++ Don't create the info files, they are not used by nautilus 2.20 
+  anyway.
++ Fix a small leak.
+
+Index: gnome-session-2.22.2/gnome-session/migrate-trash.c
+===================================================================
+--- gnome-session-2.22.2.orig/gnome-session/migrate-trash.c	2008-05-27 18:20:25.761653855 +0200
++++ gnome-session-2.22.2/gnome-session/migrate-trash.c	2008-05-27 23:07:32.457659773 +0200
+@@ -218,6 +218,7 @@ move_file (const char *old_trash_dir,
+ 
+   /* TODO: Do we need to update mtime/atime here after the move? */
+ 
++#if 0
+   /* We don't know the original dirname of the file, so we'll just assume it
+    * was the desktop. This way, the file is easy to find again. */
+   original_name = g_build_filename (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP), basename, NULL);
+@@ -241,7 +242,8 @@ move_file (const char *old_trash_dir,
+   g_free (data);
+   
+   g_free (original_name_escaped);
+-  
++#endif
++
+   return TRUE;
+ }
+ 
+@@ -301,6 +303,8 @@ migrate_trash (void)
+     g_rmdir (old_trash_dir);
+ 
+   g_free (old_trash_dir);
++  g_free (info_dir);
++  g_free (files_dir);
+ 
+   return 0;
+ }

Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=16060&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series (original)
+++ desktop/unstable/gnome-session/debian/patches/series Wed May 28 00:10:19 2008
@@ -1,6 +1,7 @@
 01_ignore-gdm-lang.patch
 02_gsd-spawn.patch
 03_powermanagement.patch
+04_trash_link.patch
 09_splash_hide.patch
 10_update_notifier.patch
 90_autoconf-autoheader.patch