[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.8.0-1-4-g29ec31d

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit f04bde8e9fc7e32bc0a9488fac9615943ab21f95
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Dec 20 11:17:47 2010 +0000

    Drop upstream_fix_empty_database_crash, merged upstream

diff --git a/debian/patches/series b/debian/patches/series
index d022e24..1edd940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,3 @@ ubuntu_xdg-photo-dir.patch
 #ubuntu_clear_selection_on_crop.patch
 #ubuntu_only_update_timestamp_of_unprotected_versions.patch
 #ubuntu_handle_broken_uris_to_view_mode.patch
-upstream_fix_empty_database_crash
diff --git a/debian/patches/upstream_fix_empty_database_crash b/debian/patches/upstream_fix_empty_database_crash
deleted file mode 100644
index e8eaa6b..0000000
--- a/debian/patches/upstream_fix_empty_database_crash
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: f-spot.git/src/Clients/MainApp/FSpot/App.cs
-===================================================================
---- f-spot.git.orig/src/Clients/MainApp/FSpot/App.cs	2010-09-15 19:21:06.978891732 +0100
-+++ f-spot.git/src/Clients/MainApp/FSpot/App.cs	2010-09-15 19:21:26.041679597 +0100
-@@ -223,7 +223,7 @@
-         {
-             // Some users get wonky URIs here, trying to work around below.
-             // https://bugzilla.gnome.org/show_bug.cgi?id=629248
--            if (path.StartsWith ("gphoto2:usb:")) {
-+            if (path != null && path.StartsWith ("gphoto2:usb:")) {
-                 path = String.Format ("gphoto2://[{0}]", path.Substring (8));
-             }
- 

-- 
f-spot