diff -Nru f-spot-0.6.1.4/configure f-spot-0.6.1.5/configure --- f-spot-0.6.1.4/configure 2009-10-29 10:20:29.000000000 +0000 +++ f-spot-0.6.1.5/configure 2009-11-04 19:35:17.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for F-Spot 0.6.1.4. +# Generated by GNU Autoconf 2.63 for F-Spot 0.6.1.5. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -743,8 +743,8 @@ # Identity of this package. PACKAGE_NAME='F-Spot' PACKAGE_TARNAME='f-spot' -PACKAGE_VERSION='0.6.1.4' -PACKAGE_STRING='F-Spot 0.6.1.4' +PACKAGE_VERSION='0.6.1.5' +PACKAGE_STRING='F-Spot 0.6.1.5' PACKAGE_BUGREPORT='' ac_unique_file="src/main.cs" @@ -1627,7 +1627,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures F-Spot 0.6.1.4 to adapt to many kinds of systems. +\`configure' configures F-Spot 0.6.1.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1697,7 +1697,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of F-Spot 0.6.1.4:";; + short | recursive ) echo "Configuration of F-Spot 0.6.1.5:";; esac cat <<\_ACEOF @@ -1859,7 +1859,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -F-Spot configure 0.6.1.4 +F-Spot configure 0.6.1.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1873,7 +1873,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by F-Spot $as_me 0.6.1.4, which was +It was created by F-Spot $as_me 0.6.1.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2727,7 +2727,7 @@ # Define the identity of the package. PACKAGE='f-spot' - VERSION='0.6.1.4' + VERSION='0.6.1.5' cat >>confdefs.h <<_ACEOF @@ -22149,7 +22149,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by F-Spot $as_me 0.6.1.4, which was +This file was extended by F-Spot $as_me 0.6.1.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22212,7 +22212,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -F-Spot config.status 0.6.1.4 +F-Spot config.status 0.6.1.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/configure.ac /tmp/iN8LLBJYnu/f-spot-0.6.1.5/configure.ac --- f-spot-0.6.1.4/configure.ac 2009-10-29 10:19:58.000000000 +0000 +++ f-spot-0.6.1.5/configure.ac 2009-11-04 19:34:32.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT(F-Spot, 0.6.1.4) +AC_INIT(F-Spot, 0.6.1.5) AC_CONFIG_SRCDIR(src/main.cs) AM_CONFIG_HEADER(config.h) diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/debian/changelog /tmp/iN8LLBJYnu/f-spot-0.6.1.5/debian/changelog --- f-spot-0.6.1.4/debian/changelog 2009-11-08 09:24:09.000000000 +0000 +++ f-spot-0.6.1.5/debian/changelog 2009-11-08 09:24:10.000000000 +0000 @@ -1,13 +1,22 @@ -f-spot (0.6.1.4-1~ppa1) karmic; urgency=low +f-spot (0.6.1.5-1~ppa1) karmic; urgency=low - * Do not modify photo timestamps automatically + * Do not adjust timestamps in files - -- Steve McGrath Sat, 07 Nov 2009 20:11:54 -0600 + -- Steve McGrath Sun, 08 Nov 2009 03:04:24 -0600 -f-spot (0.6.1.4-0ubuntu1) karmic-proposed; urgency=low +f-spot (0.6.1.5-0ubuntu1) karmic-proposed; urgency=low - * Fakesync from Debian to karmic-proposed - * New upstream release 0.6.1.4 (LP: #463404) + * Fakesync to Karmic from Debian unstable + * New upstream release 0.6.1.5 + - make IconView responsive to mouseclicks on gdk 2.18 (LP: #448162) + - do not ignore .rw2 files + - avoid an Array.OORE on empty dbs (Mike Gemuende) + + -- Iain Lane Thu, 05 Nov 2009 17:17:47 +0000 + +f-spot (0.6.1.4-1) unstable; urgency=low + + * New upstream release 0.6.1.4 - keep sorting on startup - fix a NRE on LastRollDialog - fix the toolbar 2.28-ification @@ -20,7 +29,7 @@ policy * Refresh various patches to apply cleanly - -- Iain Lane Thu, 29 Oct 2009 15:45:46 +0000 + -- Iain Lane Thu, 29 Oct 2009 14:30:30 +0000 f-spot (0.6.1.3-2) unstable; urgency=low diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/extensions/Exporters/FacebookExport/FacebookExport.addin.xml /tmp/iN8LLBJYnu/f-spot-0.6.1.5/extensions/Exporters/FacebookExport/FacebookExport.addin.xml --- f-spot-0.6.1.4/extensions/Exporters/FacebookExport/FacebookExport.addin.xml 2009-10-19 08:21:28.000000000 +0100 +++ f-spot-0.6.1.5/extensions/Exporters/FacebookExport/FacebookExport.addin.xml 2009-11-04 16:07:05.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/extensions/Exporters/FacebookExport/FacebookExport.cs /tmp/iN8LLBJYnu/f-spot-0.6.1.5/extensions/Exporters/FacebookExport/FacebookExport.cs --- f-spot-0.6.1.4/extensions/Exporters/FacebookExport/FacebookExport.cs 2009-10-16 20:35:58.000000000 +0100 +++ f-spot-0.6.1.5/extensions/Exporters/FacebookExport/FacebookExport.cs 2009-11-04 16:07:05.000000000 +0000 @@ -381,6 +381,10 @@ progress_dialog.Fraction = 1.0; progress_dialog.ProgressText = Catalog.GetString ("Upload Complete"); progress_dialog.ButtonLabel = Gtk.Stock.Ok; + + var li = new LinkButton ("http://www.facebook.com/group.php?gid=158960179844&ref=mf", Catalog.GetString ("Visit F-Spot group on Facebook")); + progress_dialog.VBoxPackEnd (li); + li.ShowAll (); } } } diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/f-spot.desktop /tmp/iN8LLBJYnu/f-spot-0.6.1.5/f-spot.desktop --- f-spot-0.6.1.4/f-spot.desktop 2009-10-29 10:20:48.000000000 +0000 +++ f-spot-0.6.1.5/f-spot.desktop 2009-11-04 19:36:12.000000000 +0000 @@ -215,5 +215,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=f-spot X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=0.6.1.4 +X-GNOME-Bugzilla-Version=0.6.1.5 X-GNOME-DocPath=f-spot/f-spot.xml diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/f-spot.desktop.in /tmp/iN8LLBJYnu/f-spot-0.6.1.5/f-spot.desktop.in --- f-spot-0.6.1.4/f-spot.desktop.in 2009-10-29 10:20:43.000000000 +0000 +++ f-spot-0.6.1.5/f-spot.desktop.in 2009-11-04 19:35:37.000000000 +0000 @@ -13,5 +13,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=f-spot X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=0.6.1.4 +X-GNOME-Bugzilla-Version=0.6.1.5 X-GNOME-DocPath=f-spot/f-spot.xml diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/f-spot-import.desktop /tmp/iN8LLBJYnu/f-spot-0.6.1.5/f-spot-import.desktop --- f-spot-0.6.1.4/f-spot-import.desktop 2009-10-29 10:20:48.000000000 +0000 +++ f-spot-0.6.1.5/f-spot-import.desktop 2009-11-04 19:36:12.000000000 +0000 @@ -208,5 +208,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=f-spot X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=0.6.1.4 +X-GNOME-Bugzilla-Version=0.6.1.5 X-GNOME-DocPath=f-spot/f-spot.xml diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/f-spot-import.desktop.in /tmp/iN8LLBJYnu/f-spot-0.6.1.5/f-spot-import.desktop.in --- f-spot-0.6.1.4/f-spot-import.desktop.in 2009-10-29 10:20:43.000000000 +0000 +++ f-spot-0.6.1.5/f-spot-import.desktop.in 2009-11-04 19:35:37.000000000 +0000 @@ -14,5 +14,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=f-spot X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=0.6.1.4 +X-GNOME-Bugzilla-Version=0.6.1.5 X-GNOME-DocPath=f-spot/f-spot.xml diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/f-spot.spec /tmp/iN8LLBJYnu/f-spot-0.6.1.5/f-spot.spec --- f-spot-0.6.1.4/f-spot.spec 2009-10-29 10:20:43.000000000 +0000 +++ f-spot-0.6.1.5/f-spot.spec 2009-11-04 19:35:37.000000000 +0000 @@ -1,6 +1,6 @@ Summary: F-Spot Name: f-spot -Version: 0.6.1.4 +Version: 0.6.1.5 Release: 1 License: GPL Group: Applications/Imaging diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/f-spot-view.desktop /tmp/iN8LLBJYnu/f-spot-0.6.1.5/f-spot-view.desktop --- f-spot-0.6.1.4/f-spot-view.desktop 2009-10-29 10:20:48.000000000 +0000 +++ f-spot-0.6.1.5/f-spot-view.desktop 2009-11-04 19:36:12.000000000 +0000 @@ -165,5 +165,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=f-spot X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=0.6.1.4 +X-GNOME-Bugzilla-Version=0.6.1.5 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/svg+xml;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/x-dcraw;image/x-ciff;image/x-mrw;image/x-x3f;image/x-orf;image/x-nef;image/x-cr2;image/x-raf; diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/f-spot-view.desktop.in /tmp/iN8LLBJYnu/f-spot-0.6.1.5/f-spot-view.desktop.in --- f-spot-0.6.1.4/f-spot-view.desktop.in 2009-10-29 10:20:43.000000000 +0000 +++ f-spot-0.6.1.5/f-spot-view.desktop.in 2009-11-04 19:35:37.000000000 +0000 @@ -13,5 +13,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=f-spot X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=0.6.1.4 +X-GNOME-Bugzilla-Version=0.6.1.5 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/svg+xml;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/x-dcraw;image/x-ciff;image/x-mrw;image/x-x3f;image/x-orf;image/x-nef;image/x-cr2;image/x-raf; diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/NEWS /tmp/iN8LLBJYnu/f-spot-0.6.1.5/NEWS --- f-spot-0.6.1.4/NEWS 2009-10-29 10:19:18.000000000 +0000 +++ f-spot-0.6.1.5/NEWS 2009-11-04 19:33:41.000000000 +0000 @@ -1,3 +1,10 @@ +f-spot 0.6.1.5 - Nov 4 2009 - What Next ? +----------------------------------------- +- bugfix release for 0.6.x branch + - make IconView responsive to mouseclicks on gdk 2.18 (bgo #600032) + - do not ignore .rw2 files (bgo #593474) + - avoid an Array.OORE on empty dbs (bgo #566977) (Mike Gemuende) + f-spot 0.6.1.4 - Oct 29 2009 - Dedication ----------------------------------------- - bugfix release for 0.6.x branch diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/src/FSpot.addin.xml /tmp/iN8LLBJYnu/f-spot-0.6.1.5/src/FSpot.addin.xml --- f-spot-0.6.1.4/src/FSpot.addin.xml 2009-10-18 13:26:16.000000000 +0100 +++ f-spot-0.6.1.5/src/FSpot.addin.xml 2009-11-04 16:07:05.000000000 +0000 @@ -1,6 +1,6 @@ diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/src/GroupSelector.cs /tmp/iN8LLBJYnu/f-spot-0.6.1.5/src/GroupSelector.cs --- f-spot-0.6.1.4/src/GroupSelector.cs 2009-08-24 10:43:04.000000000 +0100 +++ f-spot-0.6.1.5/src/GroupSelector.cs 2009-11-04 16:22:05.000000000 +0000 @@ -710,6 +710,9 @@ public override void StartDrag (double x, double y, uint time) { + if (!PositionValid (Position)) + return; + base.StartDrag (x, y, time); popup_label.Text = selector.Adaptor.GlassLabel (this.Position); popup_window.Show (); diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/src/Imaging/ImageFile.cs /tmp/iN8LLBJYnu/f-spot-0.6.1.5/src/Imaging/ImageFile.cs --- f-spot-0.6.1.4/src/Imaging/ImageFile.cs 2009-10-29 10:19:58.000000000 +0000 +++ f-spot-0.6.1.5/src/Imaging/ImageFile.cs 2009-11-04 19:34:32.000000000 +0000 @@ -55,6 +55,7 @@ name_table [".raw"] = typeof (FSpot.Tiff.NefFile); name_table [".kdc"] = typeof (FSpot.Tiff.NefFile); name_table [".arw"] = typeof (FSpot.Tiff.NefFile); + name_table [".rw2"] = typeof (FSpot.DCRawFile); name_table [".tiff"] = typeof (FSpot.Tiff.TiffFile); name_table [".tif"] = typeof (FSpot.Tiff.TiffFile); name_table [".orf"] = typeof (FSpot.Tiff.NefFile); @@ -237,7 +238,8 @@ ".orf", ".pef", ".raw", - ".raf" + ".raf", + ".rw2", }; foreach (string ext in raw_extensions) if (ext == System.IO.Path.GetExtension (name).ToLower ()) diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/src/UI.Dialog/ThreadProgressDialog.cs /tmp/iN8LLBJYnu/f-spot-0.6.1.5/src/UI.Dialog/ThreadProgressDialog.cs --- f-spot-0.6.1.4/src/UI.Dialog/ThreadProgressDialog.cs 2009-09-24 08:05:06.000000000 +0100 +++ f-spot-0.6.1.5/src/UI.Dialog/ThreadProgressDialog.cs 2009-11-04 16:07:05.000000000 +0000 @@ -12,6 +12,9 @@ using System; using System.Threading; +using System.Collections.Generic; + +using Gtk; namespace FSpot.UI.Dialog { public class ThreadProgressDialog : Gtk.Dialog { @@ -111,6 +114,17 @@ } } + List widgets; + public void VBoxPackEnd (Widget w) + { + if (widgets == null) + widgets = new List (); + lock (syncHandle) { + widgets.Add (w); + delay.Start (); + } + } + internal void SetProperties (string progress_text, string button_label, string message, double fraction) { lock (syncHandle) { @@ -156,6 +170,12 @@ button.Label = button_label; retry_button.Visible = skip_button.Visible = retry_skip; + if (widgets != null && widgets.Count > 0) { + foreach (var w in widgets) + VBox.PackEnd (w); + widgets.Clear (); + } + return false; } diff -Nru /tmp/LRu6xtk8O9/f-spot-0.6.1.4/src/Widgets/IconView.cs /tmp/iN8LLBJYnu/f-spot-0.6.1.5/src/Widgets/IconView.cs --- f-spot-0.6.1.4/src/Widgets/IconView.cs 2009-08-19 21:30:37.000000000 +0100 +++ f-spot-0.6.1.5/src/Widgets/IconView.cs 2009-10-30 20:32:35.000000000 +0000 @@ -213,9 +213,12 @@ Destroyed += HandleDestroyed; - AddEvents ((int) EventMask.KeyPressMask - | (int) EventMask.KeyReleaseMask - | (int) EventMask.PointerMotionMask); + AddEvents ( + (int) EventMask.KeyPressMask + | (int) EventMask.KeyReleaseMask + | (int) EventMask.PointerMotionMask + | (int) EventMask.ButtonPressMask + | (int) EventMask.ButtonReleaseMask); CanFocus = true;