[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.0.0-1-7-gebc833b

[Iain Lane]

The following commit has been merged in the master branch:
commit d3fe5491bdfb35677d708ea8cd9c5f5ee3517f42
Author: Iain Lane <laney at ubuntu.com>
Date:   Sat Aug 29 16:50:57 2009 +0100

    debian/patches/ubuntu_xdg-photo-dir.patch: Add new patch from Andrew Higginson, slightly modified, to default to update the user's default directory to XDG_PICTURES_DIR/Photos (localised) as the location to import pictures. Only applies to new users; existing users will see no change. (LP: #127315)

diff --git a/debian/changelog b/debian/changelog
index 416e07f..cf1ed15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,9 +15,13 @@ f-spot (0.6.1.1-1) karmic; urgency=low
     debian/patches/debian_link-system-gnome-keyring.patch
     debian/patches/debian_link-system-mono-addins.patch
     debian/patches/ubuntu_nofuse_fix_photo_import.patch: Update to apply cleanly
+  * debian/patches/ubuntu_xdg-photo-dir.patch: Add new patch from Andrew
+    Higginson, slightly modified, to default to update the user's default
+    directory to XDG_PICTURES_DIR/Photos (localised) as the location to import
+    pictures. Only applies to new users; existing users will see no change.
+    (LP: #127315)
 
-
- -- Iain Lane <laney at ubuntu.com>  Sat, 29 Aug 2009 14:21:00 +0100
+ -- Iain Lane <laney at ubuntu.com>  Sat, 29 Aug 2009 17:00:02 +0100
 
 f-spot (0.6.0.0-1) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 59bafff..9d2487a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ ubuntu_importer-targetdir-selector.patch
 ubuntu_fname_quote_percent.patch
 ubuntu_fix_export_crash_FlickrRemote.cs.patch
 ubuntu_nofuse_fix_photo_import.patch
+ubuntu_xdg-photo-dir.patch
diff --git a/debian/patches/ubuntu_xdg-photo-dir.patch b/debian/patches/ubuntu_xdg-photo-dir.patch
new file mode 100644
index 0000000..abc7987
--- /dev/null
+++ b/debian/patches/ubuntu_xdg-photo-dir.patch
@@ -0,0 +1,24 @@
+# ubuntu_xdg_photo_dir.patch: Patch by Andrew Higginson to set the default import target to
+# XDG pictures dir/Photos (as translated). This only affects the first run, existing users
+# will see no change
+-- 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 @@
+--- a/src/Preferences.cs
++++ b/src/Preferences.cs
+@@ -146,7 +146,14 @@
+ 			case SCREENSAVER_TAG:
+ 				return 1;
+ 			case STORAGE_PATH:
+-				return System.IO.Path.Combine (FSpot.Global.HomeDirectory, Catalog.GetString("Photos"));
++                String default_storage_path = System.IO.Path.Combine (
++                    Environment.GetFolderPath (Environment.SpecialFolder.MyPictures),
++                    Catalog.GetString ("Photos")
++                );
++				if (!System.IO.Directory.Exists (default_storage_path)) {
++					System.IO.Directory.CreateDirectory (default_storage_path);
++				}
++				return default_storage_path;
+ 			case EXPORT_EMAIL_SIZE:
+ 				return 3;	// medium size 640px
+ 			case EXPORT_EMAIL_ROTATE:

-- 
Packaging for f-spot