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,10 @@
+f-spot (0.6.0.0-1~ubuntu2) karmic; urgency=low
+
+  * debian/patches/ubuntu_fix_icc_symlink_crash.patch:
+    fix crash with symlinks in ICC directories. (LP: #412157)
+
+ -- Andy Matteson <xt.knight@gmail.com>  Tue, 11 Aug 2009 16:56:33 -0400
+
 f-spot (0.6.0.0-1~ubuntu1) karmic; urgency=low
 
   * Upload to Karmic from Debian's git VCS (LP: #410520)
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_fix_icc_symlink_crash.patch
only in patch2:
unchanged:
--- f-spot-0.6.0.0.orig/debian/patches/ubuntu_fix_icc_symlink_crash.patch
+++ f-spot-0.6.0.0/debian/patches/ubuntu_fix_icc_symlink_crash.patch
@@ -0,0 +1,20 @@
+Index: f-spot-0.6.0.0/src/Core/ColorManagement.cs
+===================================================================
+--- f-spot-0.6.0.0.orig/src/Core/ColorManagement.cs	2009-08-11 16:58:25.742120889 -0400
++++ f-spot-0.6.0.0/src/Core/ColorManagement.cs	2009-08-11 16:59:24.417621996 -0400
+@@ -54,13 +54,13 @@
+ 				foreach (string ColorProfilePath in IccColorProfilList) {
+ 					Cms.Profile profile = new Cms.Profile (ColorProfilePath);
+ 					if ((Cms.IccColorSpace)profile.ColorSpace == Cms.IccColorSpace.Rgb)
+-						profs.Add(profile.ProductName, profile);
++						if (!profs.ContainsKey(profile.ProductName)) profs.Add(profile.ProductName, profile); // fix issues with symlinks to existing profile(s)
+ 				}
+ 				string[] IcmColorProfilList = System.IO.Directory.GetFiles (path, "*.icm");
+ 				foreach (string ColorProfilePath in IcmColorProfilList) {
+ 					Cms.Profile profile = new Cms.Profile (ColorProfilePath);
+ 					if ((Cms.IccColorSpace)profile.ColorSpace == Cms.IccColorSpace.Rgb)
+-						profs.Add(profile.ProductName, profile);
++						if (!profs.ContainsKey(profile.ProductName)) profs.Add(profile.ProductName, profile); // fix issues with symlinks to existing profile(s)
+ 				}
+ 				string[] DirList = System.IO.Directory.GetDirectories (path);
+ 					foreach (string dir in DirList)