[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.7.1-1-7-ga4e8615

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit 4c0e0047c08ed2baf148b23253434a8925cf85c3
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Aug 11 20:17:10 2010 +0100

    Update XDG_PHOTO_DIR patch to apply against current source

diff --git a/debian/patches/ubuntu_xdg-photo-dir.patch b/debian/patches/ubuntu_xdg-photo-dir.patch
index ab67455..aa4f037 100644
--- a/debian/patches/ubuntu_xdg-photo-dir.patch
+++ b/debian/patches/ubuntu_xdg-photo-dir.patch
@@ -4,15 +4,15 @@
 -- f-spot-0.6.0.0.orig/debian/patches/ubuntu_xdg_photo_dir.patch
 ++ f-spot-0.6.0.0/debian/patches/ubuntu_xdg_photo_dir.patch
 @ -0,0 +1,16 @@
-Index: f-spot.git/src/Preferences.cs
+Index: f-spot.git/src/Clients/MainApp/FSpot/Preferences.cs
 ===================================================================
---- f-spot.git.orig/src/Preferences.cs	2010-07-14 11:36:00.559640002 +0100
-+++ f-spot.git/src/Preferences.cs	2010-07-14 12:24:10.179640006 +0100
-@@ -154,7 +154,14 @@
+--- f-spot.git.orig/src/Clients/MainApp/FSpot/Preferences.cs	2010-08-11 19:48:53.000000000 +0100
++++ f-spot.git/src/Clients/MainApp/FSpot/Preferences.cs	2010-08-11 20:14:35.092511532 +0100
+@@ -155,7 +155,14 @@
  			case SCREENSAVER_DELAY:
  				return 4.0;
  			case STORAGE_PATH:
--				return System.IO.Path.Combine (FSpot.Global.HomeDirectory, Catalog.GetString("Photos"));
+-				return System.IO.Path.Combine (Global.HomeDirectory, Catalog.GetString("Photos"));
 +                String default_storage_path = System.IO.Path.Combine (
 +                    Environment.GetFolderPath (Environment.SpecialFolder.MyPictures),
 +                    Catalog.GetString ("Photos")

-- 
f-spot