[Pkg-cli-apps-commits] r4903 - in /packages/f-spot/trunk/debian: ./ patches/
laney-guest at users.alioth.debian.org
laney-guest at users.alioth.debian.org
Thu May 7 15:02:17 UTC 2009
Author: laney-guest
Date: Thu May 7 15:02:17 2009
New Revision: 4903
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4903
Log:
* Backport new patches added in Ubuntu:
+ ubuntu_1024x600_CDExport.cs.dpatch:
- Make the CD exporting dialog not exceed the available resolution on
small screens.
+ ubuntu_fix_export_crash_FlickrRemote.cs.dpatch:
- Do not crash when attempting to upload images without internet
connectivity
+ ubuntu_nofuse_fix_photo_import.dpatch:
- Set X-GIO-NoFuse so that gvfs URI are correctly used
+ ubuntu_raw_escape_quote.dpatch
- Escape "'" in UFRaw plugin to correct escaping error in dutch locale
+ svn-display-sidebar.dpatch
- Display sidebar by default
+ svn-no-versionellipze.dpatch
- Do not ellipise the version menu labels
* ubuntu_importer-targetdir-selector.dpatch: Only set the directory if it
exists
* debian/control: Drop sqlite, sqlite3 recommends as these were only needed
for the DB migration which happened in Lenny
Added:
packages/f-spot/trunk/debian/patches/svn-display-sidebar.dpatch
packages/f-spot/trunk/debian/patches/svn-no-versionellipze.dpatch
packages/f-spot/trunk/debian/patches/ubuntu_1024x600_CDExport.cs.dpatch
packages/f-spot/trunk/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.dpatch
packages/f-spot/trunk/debian/patches/ubuntu_nofuse_fix_photo_import.dpatch
packages/f-spot/trunk/debian/patches/ubuntu_raw_escape_quote.dpatch
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/control
packages/f-spot/trunk/debian/patches/00list
packages/f-spot/trunk/debian/patches/ubuntu_importer-targetdir-selector.dpatch
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=4903&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Thu May 7 15:02:17 2009
@@ -1,3 +1,27 @@
+f-spot (0.5.0.3-4) UNRELEASED; urgency=low
+
+ * Backport new patches added in Ubuntu:
+ + ubuntu_1024x600_CDExport.cs.dpatch:
+ - Make the CD exporting dialog not exceed the available resolution on
+ small screens.
+ + ubuntu_fix_export_crash_FlickrRemote.cs.dpatch:
+ - Do not crash when attempting to upload images without internet
+ connectivity
+ + ubuntu_nofuse_fix_photo_import.dpatch:
+ - Set X-GIO-NoFuse so that gvfs URI are correctly used
+ + ubuntu_raw_escape_quote.dpatch
+ - Escape "'" in UFRaw plugin to correct escaping error in dutch locale
+ + svn-display-sidebar.dpatch
+ - Display sidebar by default
+ + svn-no-versionellipze.dpatch
+ - Do not ellipise the version menu labels
+ * ubuntu_importer-targetdir-selector.dpatch: Only set the directory if it
+ exists
+ * debian/control: Drop sqlite, sqlite3 recommends as these were only needed
+ for the DB migration which happened in Lenny
+
+ -- Iain Lane <laney at ubuntu.com> Thu, 07 May 2009 15:28:33 +0100
+
f-spot (0.5.0.3-3) unstable; urgency=low
* debian/control:
Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=4903&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Thu May 7 15:02:17 2009
@@ -56,7 +56,7 @@
Package: f-spot
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, dbus, gvfs-bin
-Recommends: dcraw, sqlite, sqlite3, dbus-x11
+Recommends: dcraw, dbus-x11
Description: personal photo management application
F-Spot is a full-featured personal photo management application for the
GNOME desktop. It simplifies digital photography by providing intuitive
Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=4903&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Thu May 7 15:02:17 2009
@@ -18,6 +18,13 @@
ubuntu_importer-targetdir-selector
ubuntu_fname_quote_percent
+ubuntu_1024x600_CDExport.cs.dpatch
+ubuntu_fix_export_crash_FlickrRemote.cs.dpatch
+ubuntu_nofuse_fix_photo_import.dpatch
+ubuntu_raw_escape_quote.dpatch
+
+svn-display-sidebar.dpatch
+svn-no-versionellipze.dpatch
# Patches to be applied last.
99_ltmain_as-needed
Added: packages/f-spot/trunk/debian/patches/svn-display-sidebar.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn-display-sidebar.dpatch?rev=4903&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/svn-display-sidebar.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/svn-display-sidebar.dpatch Thu May 7 15:02:17 2009
@@ -1,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## svn-display-sidebar.dpatch by Sebastien Bacher <seb128 at ubuntu.com>
+##
+## DP: Display the sidebar by default (taken from upstream SVN)
+## DP: LP: #286490
+ at DPATCH@
+diff -urNad f-spot-0.5.0.3~/src/Preferences.cs f-spot-0.5.0.3/src/Preferences.cs
+--- f-spot-0.5.0.3~/src/Preferences.cs 2008-10-16 08:42:01.000000000 +0200
++++ f-spot-0.5.0.3/src/Preferences.cs 2009-04-08 14:24:52.000000000 +0200
+@@ -149,6 +149,7 @@
+ return (int) Tag.IconSize.Medium;
+
+ case SIDEBAR_POSITION:
++ return 130;
+ case ZOOM:
+ return null;
+
Added: packages/f-spot/trunk/debian/patches/svn-no-versionellipze.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn-no-versionellipze.dpatch?rev=4903&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/svn-no-versionellipze.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/svn-no-versionellipze.dpatch Thu May 7 15:02:17 2009
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## svn-no-versionellipze.dpatch by Sebastien Bacher <seb128 at ubuntu.com>
+##
+## DP: Do not ellipize the version menu labels (taken from upstream svn)
+## DP: LP: #296852, #356989
+
+ at DPATCH@
+diff -urNad f-spot-0.5.0.3~/src/PhotoVersionMenu.cs f-spot-0.5.0.3/src/PhotoVersionMenu.cs
+--- f-spot-0.5.0.3~/src/PhotoVersionMenu.cs 2008-10-18 12:54:25.000000000 +0200
++++ f-spot-0.5.0.3/src/PhotoVersionMenu.cs 2009-04-08 14:27:57.000000000 +0200
+@@ -56,7 +56,6 @@
+ menu_item.Show ();
+ menu_item.Sensitive = true;
+ ((Gtk.Label)menu_item.Child).UseUnderline = false;
+- ((Gtk.Label)menu_item.Child).Ellipsize = Pango.EllipsizeMode.End;
+ menu_item.Activated += new EventHandler (HandleMenuItemActivated);
+
+ item_infos [i ++] = new MenuItemInfo (menu_item, id);
+@@ -68,7 +67,6 @@
+ MenuItem no_edits_menu_item = new MenuItem (Mono.Unix.Catalog.GetString ("(No Edits)"));
+ no_edits_menu_item.Show ();
+ no_edits_menu_item.Sensitive = false;
+- ((Gtk.Label)no_edits_menu_item.Child).Ellipsize = Pango.EllipsizeMode.End;
+ Append (no_edits_menu_item);
+ }
+ }
Added: packages/f-spot/trunk/debian/patches/ubuntu_1024x600_CDExport.cs.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/ubuntu_1024x600_CDExport.cs.dpatch?rev=4903&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/ubuntu_1024x600_CDExport.cs.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/ubuntu_1024x600_CDExport.cs.dpatch Thu May 7 15:02:17 2009
@@ -1,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ubuntu_1024x600_CDExport.cs.dpatch by <Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>>
+##
+## DP: small screen compatibility
+## DP: LP: #320817
+## DP: http://bugzilla.gnome.org/show_bug.cgi?id=569183
+
+ at DPATCH@
+diff -urNad f-spot-0.5.0.3~/extensions/Exporters/CDExport/CDExport.cs f-spot-0.5.0.3/extensions/Exporters/CDExport/CDExport.cs
+--- f-spot-0.5.0.3~/extensions/Exporters/CDExport/CDExport.cs 2009-01-24 19:41:57.000000000 +0800
++++ f-spot-0.5.0.3/extensions/Exporters/CDExport/CDExport.cs 2009-01-24 19:49:12.006265409 +0800
+@@ -48,6 +48,13 @@
+ xml = new Glade.XML (null, "CDExport.glade", dialog_name, "f-spot");
+ xml.Autoconnect (this);
+
++ if (Gdk.Screen.Default.Height <= 600) {
++ Gtk.Widget thumbScrolledWindow;
++ thumbScrolledWindow = xml.GetWidget ("thumb_scrolledwindow");
++ if (thumbScrolledWindow != null) {
++ thumbScrolledWindow.SetSizeRequest(512,System.Math.Max(512-(768-Gdk.Screen.Default.Height),100));
++ }
++ }
+ this.selection = selection;
+
+ // Calculate the total size
+@@ -74,6 +81,12 @@
+
+ thumb_scrolledwindow.Add (view);
+ Dialog.ShowAll ();
++ if (Gdk.Screen.Default.Height <= 600) {
++ int oldw=0;
++ int oldh=0;
++ Dialog.GetSize(out oldw,out oldh);
++ Dialog.Resize(oldw,Gdk.Screen.Default.Height*7/10);
++ }
+
+ previous_frame.Visible = IsEmpty (dest);
+ //LoadHistory ();
Added: packages/f-spot/trunk/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.dpatch?rev=4903&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.dpatch Thu May 7 15:02:17 2009
@@ -1,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ubuntu_fix_export_crash_FlickrRemote.cs.dpatch by <Ying-Chun Liu (PaulLiu) <grandpaul at gmail.com>>
+##
+## DP: Do not crash when exporting to flickr and having internet connectivity issues
+## DP: LP: #320602
+## DP: http://bugzilla.gnome.org/show_bug.cgi?id=553518
+
+ at DPATCH@
+diff -urNad f-spot-0.5.0.3~/extensions/Exporters/FlickrExport/FlickrRemote.cs f-spot-0.5.0.3/extensions/Exporters/FlickrExport/FlickrRemote.cs
+--- f-spot-0.5.0.3~/extensions/Exporters/FlickrExport/FlickrRemote.cs 2008-09-26 16:27:39.000000000 +0800
++++ f-spot-0.5.0.3/extensions/Exporters/FlickrExport/FlickrRemote.cs 2009-02-25 20:19:39.901273356 +0800
+@@ -17,6 +17,7 @@
+ using FSpot;
+ using FSpot.Utils;
+ using FSpot.Filters;
++using FSpot.UI.Dialog;
+
+ public class FlickrRemote {
+ public static Licenses licenses;
+@@ -103,6 +104,7 @@
+
+ public Auth CheckLogin ()
+ {
++ try {
+ if (frob == null) {
+ frob = flickr.AuthGetFrob ();
+ if (frob == null) {
+@@ -110,6 +112,13 @@
+ return null;
+ }
+ }
++ } catch (Exception e) {
++ Console.WriteLine("{0} Exception caught.",e);
++ HigMessageDialog md = new HigMessageDialog (null,Gtk.DialogFlags.Modal |Gtk.DialogFlags.DestroyWithParent,Gtk.MessageType.Error, Gtk.ButtonsType.Ok,Mono.Unix.Catalog.GetString("Error reading server response"),String.Format( Mono.Unix.Catalog.GetString("The following error was encountered while attempting to log in: {0}"), e.Message));
++ md.Run();
++ md.Destroy();
++ return null;
++ }
+
+ if (token == null) {
+ try {
+@@ -194,10 +203,17 @@
+ }
+
+ public void TryWebLogin () {
++ try {
+ frob = flickr.AuthGetFrob ();
+ string login_url = flickr.AuthCalcUrl (frob, FlickrNet.AuthLevel.Write);
+
+ GnomeUtil.UrlShow (login_url);
++ } catch (Exception e) {
++ Console.WriteLine("{0} Exception caught.",e);
++ HigMessageDialog md = new HigMessageDialog (null,Gtk.DialogFlags.Modal |Gtk.DialogFlags.DestroyWithParent,Gtk.MessageType.Error, Gtk.ButtonsType.Ok,Mono.Unix.Catalog.GetString ("Error reading server response"),String.Format (Mono.Unix.Catalog.GetString("The following error was encountered while attempting to log in: {0}"), e.Message));
++ md.Run();
++ md.Destroy();
++ }
+ }
+
+ public class Service {
Modified: packages/f-spot/trunk/debian/patches/ubuntu_importer-targetdir-selector.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/ubuntu_importer-targetdir-selector.dpatch?rev=4903&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/ubuntu_importer-targetdir-selector.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/ubuntu_importer-targetdir-selector.dpatch Thu May 7 15:02:17 2009
@@ -1,13 +1,14 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## ubuntu_importer-targetdir-selector.dpatch by Chris Coulson <chrisccoulson at googlemail.com>
+## ubuntu_importer-targetdir-selector.dpatch by Martin Pitt <martin.pitt at ubuntu.com>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Add a target directory selector to the camera import dialog, so that
+## DP: people can continue to use their customized directory layout.
+## DP: LP: #182858, http://bugzilla.gnome.org/show_bug.cgi?id=511569
@DPATCH@
-diff -urNad f-spot-0.5.0.2~/src/CameraFileSelectionDialog.cs f-spot-0.5.0.2/src/CameraFileSelectionDialog.cs
---- f-spot-0.5.0.2~/src/CameraFileSelectionDialog.cs 2008-09-26 09:27:39.000000000 +0100
-+++ f-spot-0.5.0.2/src/CameraFileSelectionDialog.cs 2008-10-06 19:11:16.000000000 +0100
+diff -urNad f-spot-0.5.0.3~/src/CameraFileSelectionDialog.cs f-spot-0.5.0.3/src/CameraFileSelectionDialog.cs
+--- f-spot-0.5.0.3~/src/CameraFileSelectionDialog.cs 2008-09-26 10:27:39.000000000 +0200
++++ f-spot-0.5.0.3/src/CameraFileSelectionDialog.cs 2009-03-25 13:17:50.000000000 +0100
@@ -33,6 +33,7 @@
[Widget] Gtk.OptionMenu tag_option_menu;
[Widget] Gtk.CheckButton attach_check;
@@ -16,16 +17,17 @@
GPhotoCamera camera;
ListStore preview_list_store;
-@@ -91,6 +92,8 @@
+@@ -90,6 +91,9 @@
+ CreateTagMenu ();
attach_check.Toggled += HandleTagToggled;
HandleTagToggled (null, null);
++
++ if (File.Exists(FSpot.Global.PhotoDirectory))
++ dest_dir_chooser.SetCurrentFolder(FSpot.Global.PhotoDirectory);
-+ dest_dir_chooser.SetCurrentFolder(FSpot.Global.PhotoDirectory);
-+
GetPreviews ();
}
-
-@@ -279,7 +282,11 @@
+@@ -279,7 +283,11 @@
return new SaveResult (path, true);
} else {
@@ -38,9 +40,9 @@
System.IO.File.Move (path, dest);
return new SaveResult (dest, false);
-diff -urNad f-spot-0.5.0.2~/src/f-spot.glade f-spot-0.5.0.2/src/f-spot.glade
---- f-spot-0.5.0.2~/src/f-spot.glade 2008-10-06 11:10:21.000000000 +0100
-+++ f-spot-0.5.0.2/src/f-spot.glade 2008-10-06 19:16:04.000000000 +0100
+diff -urNad f-spot-0.5.0.3~/src/f-spot.glade f-spot-0.5.0.3/src/f-spot.glade
+--- f-spot-0.5.0.3~/src/f-spot.glade 2008-10-18 12:54:25.000000000 +0200
++++ f-spot-0.5.0.3/src/f-spot.glade 2009-03-25 13:15:07.000000000 +0100
@@ -647,10 +647,44 @@
</widget>
<packing>
Added: packages/f-spot/trunk/debian/patches/ubuntu_nofuse_fix_photo_import.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/ubuntu_nofuse_fix_photo_import.dpatch?rev=4903&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/ubuntu_nofuse_fix_photo_import.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/ubuntu_nofuse_fix_photo_import.dpatch Thu May 7 15:02:17 2009
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ubuntu_nofuse_fix_photo_import.dpatch by Sebastien Bacher <seb128 at ubuntu.com>
+##
+## DP: Set X-GIO-NoFuse in the import desktop so gvfs uri are correctly used
+## DP: LP: #338466
+
+ at DPATCH@
+diff -urNad f-spot-0.5.0.3~/f-spot-import.desktop.in f-spot-0.5.0.3/f-spot-import.desktop.in
+--- f-spot-0.5.0.3~/f-spot-import.desktop.in 2008-10-18 13:48:28.000000000 +0200
++++ f-spot-0.5.0.3/f-spot-import.desktop.in 2009-03-10 15:39:39.000000000 +0100
+@@ -17,3 +17,4 @@
+ X-GNOME-Bugzilla-Version=0.5.0.3
+ X-GNOME-DocPath=f-spot/f-spot.xml
+ X-SuSE-translate=true
++X-GIO-NoFuse=true
+diff -urNad f-spot-0.5.0.3~/f-spot-import.desktop.in.in f-spot-0.5.0.3/f-spot-import.desktop.in.in
+--- f-spot-0.5.0.3~/f-spot-import.desktop.in.in 2008-09-26 10:27:39.000000000 +0200
++++ f-spot-0.5.0.3/f-spot-import.desktop.in.in 2009-03-10 15:39:43.000000000 +0100
+@@ -17,3 +17,4 @@
+ X-GNOME-Bugzilla-Version=@VERSION@
+ X-GNOME-DocPath=f-spot/f-spot.xml
+ X-SuSE-translate=true
++X-GIO-NoFuse=true
Added: packages/f-spot/trunk/debian/patches/ubuntu_raw_escape_quote.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/ubuntu_raw_escape_quote.dpatch?rev=4903&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/ubuntu_raw_escape_quote.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/ubuntu_raw_escape_quote.dpatch Thu May 7 15:02:17 2009
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## DP: Add escaping of "'" to DevelopInUfraw plugin, so developing RAW files
+## DP: works again in the Dutch locale. Thanks to Martijn van de Streek!
+## DP: Ubuntu: https://launchpad.net/bugs/346648
+## DP: Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=576411
+ at DPATCH@
+--- f-spot-0.5.0.3.orig/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
++++ f-spot-0.5.0.3/extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs
+@@ -178,6 +178,7 @@
+ escaped = escaped.Replace (" ", "\\ ");
+ escaped = escaped.Replace ("(", "\\(");
+ escaped = escaped.Replace (")", "\\)");
++ escaped = escaped.Replace ("'", "\\'");
+ return escaped;
+ }
+
More information about the Pkg-cli-apps-commits
mailing list