diff -u f-spot-0.4.3.1/debian/copyright f-spot-0.4.3.1/debian/copyright --- f-spot-0.4.3.1/debian/copyright +++ f-spot-0.4.3.1/debian/copyright @@ -146,8 +146,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GPL can be found in /usr/share/common-licenses/GPL. @@ -222,8 +222,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GPL can be found in /usr/share/common-licenses/GPL. @@ -246,8 +246,8 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. On Debian systems, the complete text of the LGPL can be found in /usr/share/common-licenses/LGPL. diff -u f-spot-0.4.3.1/debian/changelog f-spot-0.4.3.1/debian/changelog --- f-spot-0.4.3.1/debian/changelog +++ f-spot-0.4.3.1/debian/changelog @@ -1,3 +1,20 @@ +f-spot (0.4.3.1-1ubuntu1) intrepid; urgency=low + + * Merged from Debian unstable, remaining Ubuntu changes: + + Re-added Ubuntu patches: + - ubuntu_importer-targetdir-selector.dpatch + - ubuntu_no-extra-logging.dpatch + + debian/control: + - Move sqlite, sqlite3 and dbus-x11 from Recommends to Depends. + - Disable beagle. + - Changed maintainer field. + + debian/copyright: + - Updated FSF address. + + Dropped debian/f-spot-import.desktop, merged upstream. + + Dropped fix_gnome_screensaver.dpatch, merged upstream. + + -- Matvey Kozhev Sat, 03 May 2008 19:30:32 +0700 + f-spot (0.4.3.1-1) unstable; urgency=low [ Tim Retout ] @@ -34,6 +51,46 @@ -- Mirco Bauer Fri, 02 May 2008 16:10:21 +0200 +f-spot (0.4.2-1ubuntu3) hardy; urgency=low + + * debian/control: + - Depends on sqlite, sqlite3 rather than Recommends those they are required + to migrate the database after upgrades + * debian/patches/no_extra_logging.dpatch: + - don't write to much non debug informations + + -- Sebastien Bacher Mon, 14 Apr 2008 14:06:59 +0200 + +f-spot (0.4.2-1ubuntu2) hardy; urgency=low + + * Fixed an issue regarding gnome-screensaver, thanks to Lorenzo Milesi + for the original code. LP: #208629 + + -- Paul Schorfheide Mon, 07 Apr 2008 22:35:39 -0500 + +f-spot (0.4.2-1ubuntu1) hardy; urgency=low + + * Sync on Debian + * debian/control.in: + - don't use beagle + - updated maintainer information + * debian/patches/importer_targetdir_selector.dpatch: + - Add a target directory selector to the camera import dialog, so that + people can continue to use their customized directory layout. + + [ James Westby ] + * Change the fix from 0.4.1-4ubuntu4 to use a separate + f-spot-import.desktop, as f-spot.desktop will not start + f-spot if you pass it a directory. This happens when you + use the context bar in nautilus to open f-spot from e.g. + a CF card full of photos. There is already an f-spot + command provided in the path. To use that we will create + a new .desktop that is associated with those mimetypes + and leave the normal f-spot.desktop to provide the menu + item. (LP: #191475) + + -- Sebastien Bacher Wed, 26 Mar 2008 09:43:45 +0100 + f-spot (0.4.2-1) unstable; urgency=low * New upstream version. (Closes: #470788, #470814, #457030, #459273) @@ -77,6 +134,108 @@ -- Tim Retout Thu, 20 Mar 2008 19:45:46 +0000 +f-spot (0.4.2-0ubuntu4) hardy; urgency=low + + * debian/patches/gtkhtml-sharp-3.14_port.dpatch: + + Fix configure script to check for gnome-sharp-2.0 instead of + gnome-sharp. + + -- Sebastian Dröge Sat, 22 Mar 2008 13:54:27 +0100 + +f-spot (0.4.2-0ubuntu3) hardy; urgency=low + + * debian/patches/gtkhtml-sharp-3.14_port.dpatch, + debian/control: + + Build with gtkhtml-sharp-3.14. Patch taken from the Debian package. + + -- Sebastian Dröge Fri, 21 Mar 2008 19:26:43 +0100 + +f-spot (0.4.2-0ubuntu2) hardy; urgency=low + + * Added debian/patches/fix_cms_linkage.dpatch: + - Fix build of Cms.dll with libfspot to get the + "Automatically adjust the colors" button working again + (fixed in upstream SVN 3690) (LP: #192933) + + -- Matvey Kozhev Mon, 18 Feb 2008 21:15:51 +0600 + +f-spot (0.4.2-0ubuntu1) hardy; urgency=low + + * New upstream release. (LP: #192041) + * Dropped patches originally from older upstream SVN: + - 20_refresh-menus-on-extensions.dpatch + - 25_delete-from-disk-throw-exception.dpatch + - 30_fix-infinite-loop.dpatch + - 35_validate-gallery-names.dpatch + - 40_flickr-export-crash.dpatch + - 45_about-dialog.dpatch + * Dropped detect_and_upgrade_sqlite2_database.dpatch, merged upstream. + * Dropped 50-fix-missing-G_GNUC_FUNCTION.dpatch, upstream has reworked + the code to remove G_GNUC_FUNCTION. + * Deleted unused patches that have been since deleted in Debian SVN: + - 01_build-system.dpatch + - 10_cs-changes.dpatch + * Updated patches for this release: + - forward_port_to_flickrnet_2.1.5.dpatch + - link_system_libs.dpatch + - unlink_nunit.dpatch + * Updated debian/update_src_to_use_system_libs.sh to correctly substitute + FlickrNet paths. + * Added galleryexport_rm.dpatch: + - Delete makefile command attempting to + rm -f /usr/lib/f-spot/extensions/GalleryExport.addin.xml + * Added disable_bundled_flickrnet_build.dpatch: + - Prevent bundled Mono.Addins and FlickrNet from building (separated from + link_system_libs for ease of maintenance as that patch is autogenerated). + + -- Matvey Kozhev Fri, 15 Feb 2008 10:51:31 +0600 + +f-spot (0.4.1-4ubuntu4) hardy; urgency=low + + [ Matvey Kozhev ] + * debian/patches/45_about-dialog.dpatch: + - Cherry-picked migration to Gtk.AboutDialog from SVN 3568. (LP: #41825) + + [ Michael Vogt ] + * debian/patches/50-fix-missing-G_GNUC_FUNCTION.diff: + - fix ftbfs because of G_GNUC_FUNCTION + * debian/patches/55-add-mimetype.dpatch: + Modify the patch by Matvey to register F-Spot in the Media tab + in the file management preferences (LP: #191475) + + -- Michael Vogt Thu, 14 Feb 2008 09:50:24 +0100 + +f-spot (0.4.1-4ubuntu3) hardy; urgency=low + + * Add debian/patches/importer_targetdir_selector.dpatch: + - Add a target directory selector to the camera import dialog, so that + people can continue to use their customized directory layout. + - Forwarded to upstream in Gnome #511569 + - LP: #182858 + + -- Martin Pitt Wed, 23 Jan 2008 15:51:34 +0000 + +f-spot (0.4.1-4ubuntu2) hardy; urgency=low + + * debian/patches/30_fix-infinite-loop.dpatch: + - Fixed FTBFS in main.cs. (LP: #183722) + + -- Matvey Kozhev Thu, 17 Jan 2008 16:02:42 +0600 + +f-spot (0.4.1-4ubuntu1) hardy; urgency=low + + * Merged from Debian. (LP: #181332, LP: #141180) + * debian/control: + - Do not depend on beagle. + - Depend on dbus-x11. (LP: #89832) + * debian/patches: Pulled patches from upstream SVN: + - 25_delete-from-disk-throw-exception.dpatch: SVN 3472 (LP: #117862) + - 30_fix-infinite-loop.dpatch: SVN 3484 (LP: #95318) + - 35_validate-gallery-names.dpatch: SVN 3491 (LP: #85417) + - 40_flickr-export-crash.dpatch: SVN 3493 (LP: #155209) + + -- Matvey Kozhev Wed, 09 Jan 2008 01:27:06 +0600 + f-spot (0.4.1-4) unstable; urgency=low * debian/control: diff -u f-spot-0.4.3.1/debian/control f-spot-0.4.3.1/debian/control --- f-spot-0.4.3.1/debian/control +++ f-spot-0.4.3.1/debian/control @@ -1,7 +1,8 @@ Source: f-spot Section: gnome Priority: optional -Maintainer: Debian CLI Applications Team +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian CLI Applications Team Uploaders: Tim Retout , Mirco Bauer Build-Depends: debhelper (>= 5.0.0), cli-common-dev (>= 0.5.4), @@ -34,7 +35,6 @@ libgphoto2-2-dev (>= 2.1.4), libgl1-mesa-dev | libgl-dev, libxml-parser-perl, - beagle-dev (>= 0.3), gnome-screensaver, gnome-doc-utils (>= 0.3.2), docbook-xml @@ -45,8 +45,8 @@ Package: f-spot Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, dbus, beagle (>= 0.3) -Recommends: dcraw, sqlite, sqlite3, dbus-x11 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, dbus, sqlite, sqlite3, dbus-x11 +Recommends: dcraw Description: personal photo management application F-Spot is meant to be an easy-to-use photo management application. It allows for importing of your existing diff -u f-spot-0.4.3.1/debian/patches/00list f-spot-0.4.3.1/debian/patches/00list --- f-spot-0.4.3.1/debian/patches/00list +++ f-spot-0.4.3.1/debian/patches/00list @@ -10,6 +10,10 @@ debian_link-system-gnome-keyring debian_flickrnet-2.1.5-port +# Ubuntu patches +ubuntu_importer-targetdir-selector +ubuntu_no-extra-logging + # Patches to be applied last. 98_autoreconf 99_ltmain_as-needed only in patch2: unchanged: --- f-spot-0.4.3.1.orig/debian/patches/ubuntu_no-extra-logging.dpatch +++ f-spot-0.4.3.1/debian/patches/ubuntu_no-extra-logging.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## no_extra_logging.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.4.2~/src/Imaging/ImageFile.cs f-spot-0.4.2/src/Imaging/ImageFile.cs +--- f-spot-0.4.2~/src/Imaging/ImageFile.cs 2008-02-14 23:26:49.000000000 +0100 ++++ f-spot-0.4.2/src/Imaging/ImageFile.cs 2008-03-26 10:23:35.000000000 +0100 +@@ -32,7 +32,7 @@ + //if (vfs.IsLocal) + // return File.OpenRead (uri.LocalPath); + +- System.Console.WriteLine ("open uri = {0}", uri.ToString ()); ++ //System.Console.WriteLine ("open uri = {0}", uri.ToString ()); + return new Gnome.Vfs.VfsStream (uri.ToString (), FileMode.Open); + } + +diff -urNad f-spot-0.4.2~/src/PhotoStore.cs f-spot-0.4.2/src/PhotoStore.cs +--- f-spot-0.4.2~/src/PhotoStore.cs 2008-02-14 23:26:50.000000000 +0100 ++++ f-spot-0.4.2/src/PhotoStore.cs 2008-03-26 10:22:56.000000000 +0100 +@@ -675,7 +675,7 @@ + query_builder.Append (String.Join (" AND ", ((String []) where_clauses.ToArray (typeof(String))))); + } + query_builder.Append (" ORDER BY photos.time"); +- Console.WriteLine ("Query: {0}", query_builder.ToString()); ++ //Console.WriteLine ("Query: {0}", query_builder.ToString()); + return Query (query_builder.ToString ()); + } + } +diff -urNad f-spot-0.4.2~/src/main.cs f-spot-0.4.2/src/main.cs +--- f-spot-0.4.2~/src/main.cs 2008-02-14 23:26:50.000000000 +0100 ++++ f-spot-0.4.2/src/main.cs 2008-03-26 10:24:27.000000000 +0100 +@@ -145,7 +145,7 @@ + Defines.VERSION, + Modules.UI, args); + +- Console.WriteLine ("Initializing Mono.Addins"); ++ //Console.WriteLine ("Initializing Mono.Addins"); + AddinManager.Initialize (FSpot.Global.BaseDirectory); + AddinManager.Registry.Update (null); + SetupService setupService = new SetupService (AddinManager.Registry); only in patch2: unchanged: --- f-spot-0.4.3.1.orig/debian/patches/ubuntu_importer-targetdir-selector.dpatch +++ f-spot-0.4.3.1/debian/patches/ubuntu_importer-targetdir-selector.dpatch @@ -0,0 +1,89 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## importer_targetdir_selector.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add a destination directory selector to the camera import dialog +## DP: Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=511569 +## DP: Ubuntu: https://bugs.launchpad.net/f-spot/+bug/182858 + +@DPATCH@ +diff -urNad f-spot-0.4.1~/src/CameraFileSelectionDialog.cs f-spot-0.4.1/src/CameraFileSelectionDialog.cs +--- f-spot-0.4.1~/src/CameraFileSelectionDialog.cs 2007-12-04 12:19:18.000000000 +0000 ++++ f-spot-0.4.1/src/CameraFileSelectionDialog.cs 2008-01-23 15:16:44.000000000 +0000 +@@ -30,6 +30,7 @@ + [Widget] Gtk.TreeView file_tree; + [Widget] Gtk.OptionMenu tag_option_menu; + [Widget] Gtk.CheckButton attach_check; ++ [Widget] Gtk.FileChooserButton dest_dir_chooser; + + GPhotoCamera camera; + ListStore preview_list_store; +@@ -87,6 +88,8 @@ + CreateTagMenu (); + attach_check.Toggled += HandleTagToggled; + HandleTagToggled (null, null); ++ ++ dest_dir_chooser.SetCurrentFolder(FSpot.Global.PhotoDirectory); + + GetPreviews (); + } +@@ -266,7 +269,11 @@ + + camera.SaveFile (index, path); + +- string dest = FileImportBackend.ChooseLocation (path); ++ string dest; ++ if (dest_dir_chooser.Filename == FSpot.Global.PhotoDirectory) ++ dest = FileImportBackend.ChooseLocation (path); ++ else ++ dest = Path.Combine (dest_dir_chooser.Filename, camfile.FileName.ToLower ()); + System.IO.File.Move (path, dest); + path = dest; + +diff -urNad f-spot-0.4.1~/src/f-spot.glade f-spot-0.4.1/src/f-spot.glade +--- f-spot-0.4.1~/src/f-spot.glade 2007-12-04 12:19:18.000000000 +0000 ++++ f-spot-0.4.1/src/f-spot.glade 2008-01-23 15:18:31.000000000 +0000 +@@ -647,9 +647,43 @@ + + + False ++ False + 2 + + ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ Target location: ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ++ Choose destination directory ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ + + + 1