diff -u f-spot-0.6.0.0/debian/control f-spot-0.6.0.0/debian/control
--- f-spot-0.6.0.0/debian/control
+++ f-spot-0.6.0.0/debian/control
@@ -1,7 +1,8 @@
 Source: f-spot
 Section: gnome
 Priority: optional
-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team@lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey@debian.org>, Iain Lane <laney@ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
  cli-common-dev (>= 0.5.4),
@@ -39,7 +40,7 @@
  intltool,
  libtool,
  autoconf,
- automake1.10
+ automake
 Standards-Version: 3.8.2.0
 Homepage: http://www.f-spot.org/
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/f-spot.git
diff -u f-spot-0.6.0.0/debian/changelog f-spot-0.6.0.0/debian/changelog
--- f-spot-0.6.0.0/debian/changelog
+++ f-spot-0.6.0.0/debian/changelog
@@ -1,3 +1,17 @@
+f-spot (0.6.0.0-1ubuntu1) karmic; urgency=low
+
+  * debian/patches/ubuntu_xdg_photo_dir.patch
+    - Create and use XDG_PICTURES_DIR/Photos by default
+      (LP: #127315)
+  * debian/control
+    - Replaced 'automake1.10' with 'automake', Debian has this 
+      package but Ubuntu does not
+    - Updated maintainers (moved Debian maintainer to 
+      XSBC-Original-Maintainer and Ubuntu Desktop Team to 
+      Maintainer)
+
+ -- Andrew Higginson <rugby471@gmail.com>  Wed, 19 Aug 2009 08:08:08 +0100
+
 f-spot (0.6.0.0-1) unstable; urgency=low
 
   * New Upstream Version 0.6.0.0
diff -u f-spot-0.6.0.0/debian/patches/series f-spot-0.6.0.0/debian/patches/series
--- f-spot-0.6.0.0/debian/patches/series
+++ f-spot-0.6.0.0/debian/patches/series
@@ -13,0 +14 @@
+ubuntu_xdg_photo_dir.patch
only in patch2:
unchanged:
--- 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-0.6.0.0/src/Preferences.cs
+===================================================================
+--- f-spot-0.6.0.0.orig/src/Preferences.cs	2009-08-19 08:07:11.000000000 +0100
++++ f-spot-0.6.0.0/src/Preferences.cs	2009-08-19 08:07:47.000000000 +0100
+@@ -147,7 +147,10 @@
+ 			case SCREENSAVER_TAG:
+ 				return 1;
+ 			case STORAGE_PATH:
+-				return System.IO.Path.Combine (FSpot.Global.HomeDirectory, Catalog.GetString("Photos"));
++				if (!System.IO.Directory.Exists (System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.MyPictures), Catalog.GetString ("Photos")))) {
++					System.IO.Directory.CreateDirectory (System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.MyPictures), Catalog.GetString ("Photos")));
++				}
++				return System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.MyPictures), Catalog.GetString ("Photos"));
+ 			case EXPORT_EMAIL_SIZE:
+ 				return 3;	// medium size 640px
+ 			case EXPORT_EMAIL_ROTATE: