[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.7.0-1-16-g75c0894

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit 03a9907a2a5321739491346545755bccc568f1f1
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Jul 14 12:29:26 2010 +0100

    Drop default_view_size patch: Fixed upstream

diff --git a/debian/patches/series b/debian/patches/series
index 91a6d28..1edd940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +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
-
-ubuntu_default_view_size.patch
diff --git a/debian/patches/ubuntu_default_view_size.patch b/debian/patches/ubuntu_default_view_size.patch
deleted file mode 100644
index 1ee4b73..0000000
--- a/debian/patches/ubuntu_default_view_size.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-------------------------------------------------------------
-revno: 112
-committer: Christopher James Halse Rogers <christopher.halse.rogers at canonical.com>
-branch nick: edit-fixes
-timestamp: Wed 2010-03-31 17:23:34 +1100
-message:
-  Set a more reasonable default size for View mode
-modified:
-  src/Preferences.cs
-diff:
-=== modified file 'src/Preferences.cs'
-Index: f-spot.git/src/Preferences.cs
-===================================================================
---- f-spot.git.orig/src/Preferences.cs	2010-06-16 23:00:41.798603284 +0100
-+++ f-spot.git/src/Preferences.cs	2010-06-16 23:01:19.418603518 +0100
-@@ -111,7 +111,12 @@
- 			case IMPORT_WINDOW_PANE_POSITION:
- 			case FILMSTRIP_ORIENTATION:
- 				return 0;
--					
-+
-+			case VIEWER_WIDTH:
-+				return 700;
-+			case VIEWER_HEIGHT:
-+				return 550;
-+
- 			case METADATA_EMBED_IN_IMAGE:
- 			case MAIN_WINDOW_MAXIMIZED:
- 			case GROUP_ADAPTOR_ORDER_ASC:

-- 
f-spot