--- f-spot-0.5.0.3.orig/debian/copyright +++ f-spot-0.5.0.3/debian/copyright @@ -0,0 +1,261 @@ +This package was debianized by Ondřej Surý on +Sat, 4 Sep 2004 21:32:52 +0200. + +The copyright and licenses of the complete source code of f-spot 0.4.1 was +checked by Mirco Bauer on Wed, 12 Dec 2007 22:48:15 +0200. + +The current Debian maintainers are: +Mirco Bauer +Tim Retout + +It was downloaded from: +http://www.f-spot.org/ + +Upstream Authors: +Larry Ewing +Ettore Perazzoli +Paolo Bacchilega +Miguel de Icaza +Alexander Larsson +Lutz MÃŒller +Federico Mena Quintero + +Copyright: +src/* +Copyright (C) 2003-2007 Novell Inc. + +src/Cairo/Cairo.cs: +Copyright (C) 2004 Novell, Inc +Copyright (C) 2005 John Luke +Copyright (C) 2006 Alp Toker + +src/Cairo/Extend.cs +src/Cairo/Operator.cs +src/Cairo/SubpixelOrder.cs +src/Cairo/Status.cs: +Copyright (C) 2004 Novell, Inc +Copyright (C) 2005 John Luke + +src/SmugMugExport.cs: +Copyright (C) 2006 Thomas Van Machelen + +src/Imaging/JpegHeader.cs: +Copyright (c) 2006 Novell Inc. +Copyright (c) 1992 Handmade Software, Inc. + +src/FolderExport.cs: +Copyright (C) 2005 Alessandro Gervaso + +mono-addins/*: +Copyright (C) 2007 Novell, Inc + +SmugMugNet/*: +Copyright (C) 2006 Thomas Van Machelen +Copyright (C) 2006 Novell, Inc. + +Tao/*: +Copyright ©2003-2006 Tao Framework Team + +Tao/Tao.GlPostProcess/GlPostProcess.cs +Tao/Tao.OpenGl.ExtensionLoader/GlExtensionLoader.cs: +Copyright (c) 2004 Vladimir Vukicevic + +dbus-sharp/*: +dbus-sharp-glib/*: +Copyright 2006-2007 Alp Toker + +gio-sharp/* except gio-sharp/gio/FileFactory.cs: +Copyright (C) 2008 Novell, Inc. + +gio-sharp/gio/FileFactory.cs: +Copyright (C) 2008 Stephane Delcroix + +glitz-sharp/*: +Copyright 2006 Alp Toker + +gnome-keyring-sharp/*: +(C) Copyright 2006 Novell, Inc. + +gnome-keyring-sharp/Ring.cs: +(C) Copyright 2006 Novell, Inc. +(C) Copyright 2007 Alp Toker + +google-sharp/*: +(C) Copyright 2006 Novell, Inc. + +google-sharp/Authentication.cs +google-sharp/MultipartRequest.cs +google-sharp/GoogleConnection.cs +google-sharp/PicasaAlbum.cs +google-sharp/PicasaPicture.cs +google-sharp/PicasaWeb.cs +google-sharp/GoogleService.cs +google-sharp/XmlUtil.cs: +(C) Copyright 2006 Novell, Inc +(C) Copyright 2007 S. Delcroix + +semweb/*: +Copyright 2005 Joshua Tauberer + +semweb/Util.cs: +Copyright (C) 2004-2005 Novell, Inc + +libeog/*: +Copyright (C) 2000 The Free Software Foundation + +libeog/accessible-image-view.[ch] +libeog/accessible-image-view-factory.[ch]: +Copyright 2002 Sun Microsystems Inc. + +libfspot/f-image-view.[ch] +libfspot/f-utils.[ch]: +Copyright (C) 2003 Ettore Perazzoli + +libfspot/f-pixbuf-utils.[ch]: +Copyright (C) 2001, 2002, 2003 The Free Software Foundation, Inc. +Copyright (C) 2003 Ettore Perazzoli +Copyright 2002-2003 by Michael Sweet + +libfspot/f-jpeg-utils.[ch]: +Copyright (C) 2001 Red Hat Inc. +Copyright (C) 2001 The Free Software Foundation, Inc. +Copyright (C) 2003 Ettore Perazzoli + +libfspot/f-pixbuf-unsharp.[ch]: +Copyright (C) 1999 Winston Chang +Copyright 2004 Novell, Inc. + +libgphoto2-sharp/*: +Ewen Cheslack-Postava +Larry Ewing + +libjpegtran/*: +Copyright (C) 2001 Lutz Müller + +libjpegtran/transupp.[ch]: +Copyright (C) 1997, Thomas G. Lane + +libjpegtran/jpegtran.[ch]: +Copyright (C) 2001, 2002 The Free Software Foundation, Inc. +Copyright (C) 1995-1997, Thomas G. Lane + +License: + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + 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. + +On Debian systems, the complete text of the GPL can be found in +/usr/share/common-licenses/GPL. + +------------------------------------------------------------------------------- + +mono-addins/* +tao/* +dbus-sharp/* +dbus-sharp-glib/* +glitz-sharp/* +gnome-keyring-sharp/* +google-sharp/* + +MIT: + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-------------------------------------------------------------------------------- + +semweb/* + +NOTE: between f-spot 0.1.2 and 0.1.3 semweb/ was added + +Creative Commons Public License (CCPL), Attribution 2.0 + +On 2007-12-12 Joshua Tauberer the author of semweb +re-licensed (dual-licensed) semweb from CCPL to GPL 2 (or later) and CCPL. + +References: +http://razor.occams.info/code/semweb/ +http://razor.occams.info/code/repo/?/semweb/README.txt +http://mail.gnome.org/archives/f-spot-list/2007-December/msg00050.html + +As CCPL is non-free and non GPL compatible this license has no relevance to +Debian in the favor of the GPL license. + +On Debian systems, the complete text of the GPL can be found in +/usr/share/common-licenses/GPL. + +------------------------------------------------------------------------------- + +libeog/* +libfspot/* + +GPL: + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + 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. + +On Debian systems, the complete text of the GPL can be found in +/usr/share/common-licenses/GPL. + +------------------------------------------------------------------------------- + +gio-sharp/* +libjpegtran/* +libgphoto2-sharp/* + +LGPL: + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + 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. + +On Debian systems, the complete text of the LGPL can be found in +/usr/share/common-licenses/LGPL. + --- f-spot-0.5.0.3.orig/debian/watch +++ f-spot-0.5.0.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.gnome.org/pub/gnome/sources/f-spot/([\d\.]+)/f-spot-(.*)\.tar\.gz --- f-spot-0.5.0.3.orig/debian/changelog +++ f-spot-0.5.0.3/debian/changelog @@ -0,0 +1,1183 @@ +f-spot (0.5.0.3-1ubuntu5) jaunty; urgency=low + + * debian/patches/ubuntu_importer-targetdir-selector.dpatch: + - only set PhotoDirectory if it actually exists + + -- Michael Vogt Wed, 25 Mar 2009 13:33:03 +0100 + +f-spot (0.5.0.3-1ubuntu4) jaunty; urgency=low + + * debian/patches/ubuntu_nofuse_fix_photo_import.dpatch: + - set X-GIO-NoFuse in the import desktop so gvfs uri are correctly used + (lp: #338466) + + -- Sebastien Bacher Tue, 10 Mar 2009 15:28:09 +0100 + +f-spot (0.5.0.3-1ubuntu3) jaunty; urgency=low + + * debian/control: + - don't recommends sqlite, sqlite3 since the migration was done before + hardy and those are not required nowadays + * debian/patches/ubuntu_1024x600_CDExport.cs.dpatch: + - change by Ying-Chun Liu for small screen compatibility (lp: #320817) + * debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.dpatch: + - change by Ying-Chun Liu to not crash when exporting to flickr and having + internet connectivity issues (lp: #320602) + + -- Sebastien Bacher Fri, 06 Mar 2009 18:42:22 +0100 + +f-spot (0.5.0.3-1ubuntu2) jaunty; urgency=low + + * Pass CSC=/usr/bin/csc to configure, needed to fix FTBFS in gio-sharp + build. + + -- Iain Lane Tue, 10 Feb 2009 18:24:46 +0000 + +f-spot (0.5.0.3-1ubuntu1) jaunty; urgency=low + + * Merged from Debian experimental, remaining changes: + - debian/patches/svn-r4545_locales-import.dpatch: + - Patch backported from SVN trunk revision 4545 - + initialize the translation catalog earlier (LP: #293305). + Thanks to Florian Heinle for finding the patch. + - debian/control: + - Build-depend on libmono-dev (>= 1.2.4). + + -- Chris Coulson Fri, 06 Feb 2009 17:06:37 +0000 + +f-spot (0.5.0.3-1) experimental; urgency=low + + [ David Paleino ] + * debian/patches/: + + svn_folder-export.dpatch added, thanks to Arnaud Cornet. + (Closes: #491126) + * debian/watch fixed to correctly search for new releases. + + [ Mirco Bauer ] + * debian/control: + + Replaced mono-gmcs build-dep with mono-devel >= 2.0 as part of the + Mono 2.0 transition. + + Enhanced package description. + + Added gtk-sharp2-gapi to build-deps. + * debian/patches/debian_use_csc.dpatch: + + Replaces hardcoded compiler calls with MCS variable from configure. + (thanks to Iain Lane for the patch) + * debian/rules: + + Pass csc compiler variable to configure. + + [ Iain Lane ] + * New upstream version 0.5.0.3, based on Ubuntu package (Closes: #499615) + * debian/control: Build-depend on libjpeg62-dev, add gvfs-bin dependency + so that gphoto patch below works. + * debian/control: Buid-depend on mono-addins >= 0.4 so that edit sidebar + works properly and we do not have to use embedded copy of m-a. + * debian/watch: Update to correct regex. + * debian/patches/f-spot-import-gphoto.dpatch: Add. Patch by Martin Pitt to + allow f-spot to import from gphoto:/// URLs. + * debian/patches/ubuntu_fname_quote_percent.dpatch: Add. Escape '%' in + filenames so that importing from gvfs fuse paths works. Thanks to Martin + Pitt. + * debian/patches/svn-r455_fix-crash-on-icon-size-change.dpatch: Add. + Backport upstream patch to fix crash when enabling 'Color Management' in + preferences. Thanks to Chris Coulson. + * debian/patches/ubuntu_importer-targetdir-selector.dpatch: Add. Add a + destination directory selector to the camera import dialog. Thanks to + Matvey Kozhev. + * debian/patches/debian_unlink_nunit, debian_link-system-flickrnet: + Updated for new upstream version, thanks to Chris Coulson + * debian/patches/svn-folder-export, + debian/patches/debian_from-svn-gio-sharp-destdir, + debian/patches/debian_flickrnet-2.1.5-port.dpatch, + debian/patches/svn-044-4010_gio-sharp-destdir.dpatch: Removed, now + upstream. + * debian/control, debian/rules: Regenerate autotools during the build + * Add myself to Uploaders. + + [ Christopher James Halse Rogers ] + * debian/patches/debian_link_2.0_profile_cairo.dpatch: + + Link f-spot against the 2.0 profile Mono.Cairo and remove checks for + mono-cairo. libmono-cairo2.0-cil doesn't ship mono-cairo.pc, so we need + to specify it manually. + * debian/control: + + gnome-sharp2 transition: + - lib{gnome,gconf,gnome-vfs}2.0-cil -> lib{gnome,gconf,gnome-vfs}2.24-cil + + -- Iain Lane Sun, 01 Feb 2009 20:15:17 +0000 + +f-spot (0.5.0.3-0ubuntu5) jaunty; urgency=low + + * Update for mono 2.0 transition (LP: #303793): + + debian/rules: Set MCS=/usr/bin/csc for configure + + debian/patches/mono_transition_use_csc.dpatch: Added, patch hardcoded + gmcs to use $(MCS) variable to pick up new compiler + + debian/patches/98_autoreconf.dpatch: Refreshed to pick up above + + -- Iain Lane Sun, 30 Nov 2008 21:09:22 +0000 + +f-spot (0.5.0.3-0ubuntu4) intrepid-proposed; urgency=low + + * debian/patches/svn-r4555_fix-crash-on-icon-size-change.dpatch + - Updated to implement another upstream patch to fix a crash that + was exposed as a consequence of the changes made in + 0.5.0.3-0ubuntu3 (LP: #293437) + + -- Chris Coulson Tue, 04 Nov 2008 17:57:10 +0000 + +f-spot (0.5.0.3-0ubuntu3) intrepid-proposed; urgency=low + + * debian/patches/svn-r4555_fix-crash-on-icon-size-change.dpatch + - Implement upstream patch to fix a crash that occurred when + enabling 'Color Management' in the Preferences window + (LP: #291189, Gnome: #557793). + + -- Chris Coulson Sun, 02 Nov 2008 15:58:08 +0000 + +f-spot (0.5.0.3-0ubuntu2) intrepid; urgency=low + + * Add gvfs-bin dependency, so that the gvfs umounting in + f-spot-import-gphoto.dpatch can actually work. Otherwise F-Spot fails with + "Cannot lock device" on import. (LP: #258083) + + -- Martin Pitt Wed, 22 Oct 2008 00:44:44 +0200 + +f-spot (0.5.0.3-0ubuntu1) intrepid; urgency=low + + * New upstream bug fix version: + - fix a (yet another) MAJOR WTF with the duplicate detection code + - fix subselect column names for sqlite > 3.6.0 + - fix the ChangePath extension + - updated translations + * debian/patches/98_autoreconf.dpatch: + - new version update + + -- Sebastien Bacher Mon, 20 Oct 2008 09:42:06 +0200 + +f-spot (0.5.0.2-0ubuntu4) intrepid; urgency=low + + * f-spot-import-gphoto.dpatch: Also handle gphoto: URLs with a trailing + slash, as passed by nautilus. + + -- Martin Pitt Thu, 16 Oct 2008 10:07:24 +0200 + +f-spot (0.5.0.2-0ubuntu3) intrepid; urgency=low + + * Add f-spot-import-gphoto.dpatch: Fix f-spot-import to understand GIO + gphoto:// URLs, which fixes (i. e. gets rid of) the device dialog on + import. Also speculatively gvfs-umount the camera, otherwise F-Spot cannot + communicate with it. + + -- Martin Pitt Wed, 15 Oct 2008 19:30:31 +0200 + +f-spot (0.5.0.2-0ubuntu2) intrepid; urgency=low + + * Drop ubuntu_import_fuse.dpatch again, it was a quick fix for beta. It + causes f-spot to be utterly slow due to now really knowing that the fuse + directory is actually a slow libgphoto link. gvfs was changed to not + automount the camera any more, thus F-spot, gthumb, and friends will just + continue to directly talk to the camera. + + -- Martin Pitt Wed, 15 Oct 2008 13:06:34 +0200 + +f-spot (0.5.0.2-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #271895) + - Dropped svn-044-4010_gio-sharp-destdir.dpatch - implemented upstream. + - debian_unlink-nunit.dpatch: Ported to new upstream source. + - debian_link-system-flickrnet.dpatch: Ported to new upstream source. + - Dropped debian_flickrnet-2.1.5-port.dpatch - implemented upstream. + - ubuntu_importer-targetdir-selector.dpatch: Ported to new upstream + source. + - Dropped ubuntu_fix-gtk-deprecated.dpatch - implemented upstream. + - Dropped debian_link-system-mono-addins.dpatch - This seems to break + the new Edit sidebar. + - Re-generated 98_autoreconf.dpatch. + - debian/control: + - Bumped libmono-dev dependency to 1.2.4. + + -- Chris Coulson Mon, 06 Oct 2008 23:11:41 +0100 + +f-spot (0.4.4-1ubuntu4) intrepid; urgency=low + + * Add ubuntu_import_fuse.dpatch: Import from the gvfs fuse path instead of + libgphoto URL, so that we can import from libghoto handled cameras which + nautilus already automounted through gvfs-gphoto. (LP: #258083) + * Add ubuntu_fname_quote_percent.dpatch: Escape '%' in file names, so that + importing from gvfs fuse paths actually works. (Gnome #433829) + + -- Martin Pitt Mon, 29 Sep 2008 17:22:58 +0200 + +f-spot (0.4.4-1ubuntu3) intrepid; urgency=low + + * Replaced deprecated definitions in libeog to fix FTBFS. (LP: #250047) + + -- Matvey Kozhev Sat, 19 Jul 2008 13:54:51 +0700 + +f-spot (0.4.4-1ubuntu2) intrepid; urgency=low + + * Added missing build-dependencies: libjpeg62-dev, mono-mcs and + gtk-sharp2-gapi. (LP: #247626) + + -- Matvey Kozhev Fri, 11 Jul 2008 21:25:02 +0700 + +f-spot (0.4.4-1ubuntu1) intrepid; urgency=low + + * Merged from Debian unstable (LP: #246147). + + Dropped Ubuntu patches applied upstream: + - ubuntu_no-extra-logging.dpatch + - ubuntu_from-svn-allow-multiple-view-selection.dpatch + * Remaining Ubuntu changes: + + debian/patches/ubuntu_importer-targetdir-selector.dpatch: + - Add a destination directory selector to the camera import dialog. + + -- Matvey Kozhev Mon, 07 Jul 2008 08:59:42 +0700 + +f-spot (0.4.4-1) unstable; urgency=medium + + [ Tim Retout ] + * New upstream version. (Closes: #487229) + + Includes relicenced semweb library. (Closes: #479349) + (fixes RC bug, thus urgency set to medium) + + No longer crashes if gconfd-2 is not running. (Closes: #474264) + + Fixes some Spanish translation issues. (Closes: #481709, #481710) + + Add gio-sharp/* to debian/copyright. + + Update patches for new version: + - debian_unlink-nunit + - debian_link-system-flickrnet + * New patches: + + svn-044-4010_gio-sharp-destdir: Patch from upstream (via Ubuntu) to fix + missing DESTDIR variables. + * Redo 98_autoreconf patch for Makefile.am changes. + + Add build dependency on intltool, required by recent intltool versions. + + [ Mirco Bauer ] + * debian/control: + + Removed beagle from build and binary dependencies, as beagle doesn't add + any significant features but might cause a new set of issues. + (Closes: #458897) + + Added libcairo2-dev, libglu1-mesa-dev, libglitz1-dev and + libglitz-glx1-dev to build-dependencies, needed for resolving the binary + dependencies, using dh_clideps. + + Bumped Standards-Version to 3.8.0 (no changes needed). + * debian/rules + debian/NDesk.Glitz.dll.config + debian/patches/debian_fix_f-spot.exe.config.dpatch: + + Added missing DLL maps. + + -- Tim Retout Tue, 01 Jul 2008 23:35:19 +0200 + +f-spot (0.4.3.1-1ubuntu1) intrepid; urgency=low + + * Merged from Debian unstable (LP: #226117), bugs fixed upstream: + - Rotate progress dialog shows wrong information (LP: #141400) + - Slideshow funky colours on powerpc (LP: #194705) + - Page Down does not make the selection advance (LP: #200270) + * Remaining Ubuntu changes: + + Re-added Ubuntu patches: + - ubuntu_importer-targetdir-selector.dpatch + - ubuntu_no-extra-logging.dpatch + - ubuntu_from-svn-allow-multiple-view-selection.dpatch + + debian/control: + - Move dbus-x11 from Recommends to Depends. However, sqlite and sqlite3 + remain in Recommends because the database migration is complete + (LP: #217589). + - Disable beagle. + - Changed maintainer field. + + -- Matvey Kozhev Sat, 03 May 2008 19:30:32 +0700 + +f-spot (0.4.3.1-1) unstable; urgency=low + + [ Tim Retout ] + * New upstream version. + + Shows a 'missing icon' image in the import dialog rather than + throwing an exception when f-spot icon is not found. (Closes: #459261) + + Fixes crash in tag icon file chooser. (Closes: #470787) + + Fixes bug in gphoto2 bindings when using Mono 1.9. (Closes: #475662) + + Remove patches now included upstream: fix_cms_linkage, fix_v8_db_update, + gtkhtml-sharp-3.14_port, fix_gnome-sharp_typo, fix_bashisms, + fix_gallery_extension_install_hook, fix_deleting_1000_photos. + * Now prefix all remaining patch names with 'debian_' where they are not + included in the upstream SVN repository, to make them easier to track. + * debian/patches/debian_link-system-mono-addins.dpatch, + debian/patches/debian_link-system-flickrnet.dpatch: + + Remove configure.in entries so that Makefiles aren't generated. + * debian/patches/debian_link-system-flickrnet.dpatch: + + Update to account for Makefile.am change. + * debian/patches/11_screensaver_path.dpatch: + + Remove - there is no point hardcoding a full path. + * debian/control: + + Add line breaks to Build-Depends. + * debian/update_src_to_use_system_libs.sh: Remove unused script. + + [ Mirco Bauer ] + * debian/control: + + Added libgnome-keyring1.0-cil to build-dependencies. + * debian/patches/debian_link-system-gnome-keyring.dpatch: + + Link with the libgnome-keyring1.0-cil package. + * debian/patches/debian_fix-distclean.dpatch: + + "make distclean" should not remove gnome-doc-utils.make + * debian/patches/98_autoreconf.dpatch: + + Updated + + -- Mirco Bauer Fri, 02 May 2008 16:10:21 +0200 + +f-spot (0.4.3.1-0ubuntu1) hardy-proposed; urgency=low + + * New upstream version (lp: #230306): + - new print dialog with preview, new print options (lp: #222307) + * debian/patches/fix_cms_linkage.dpatch, + debian/patches/fix_v8_db_update.dpatch, + debian/patches/gtkhtml-sharp-3.14_port.dpatch, + debian/patches/fix_gnome-sharp_typo.dpatch, + debian/patches/fix_bashisms.dpatch, + debian/patches/fix_gallery_extension_install_hook.dpatch, + debian/patches/fix_deleting_1000_photos.dpatch, + debian/patches/fix_gnome_screensaver.dpatch: + - dropped, those are fixed in the new version + * debian/patches/link_system_flickrnet.dpatch: + - updated using the new debian version + * debian/patches/11_screensaver-path.dpatch: + - dropped not required debian change + * debian/patches/90_from_svn_allow_multiple_view_selection.dpatch: + - allow to select multiple files to view in nautilus (lp: #202717) + * debian/f-spot-import.desktop, debian/install: + - dropped distribution changes, the new upstream version fixes the issue + + -- Sebastien Bacher Wed, 07 May 2008 14:58:56 +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) + + Drop patches now included upstream: + - debian/patches/20_refresh-menus-on-extensions.dpatch + - debian/patches/detect_and_upgrade_sqlite2_database.dpatch + + Upstream moved Flickr export to an extension, so: + - Update debian/patches/forward_port_to_flickrnet_2.1.5.dpatch + - New patch debian/patches/link_system_flickrnet.dpatch for changes + to FlickrExport makefiles. + + Update patches for bitrot: + - debian/patches/unlink_nunit.dpatch + - debian/patches/link_system_libs.dpatch + * Delete unused patches: + + debian/patches/01_build-system.dpatch + + debian/patches/10_cs-changes.dpatch + * New patches: + + debian/patches/fix_bashisms.dpatch: + - Ensure f-spot-sqlite-upgrade will run correctly under shells other + than bash. (Closes: #464652) + + debian/patches/fix_deleting_1000_photos.dpatch: + - Fix from upstream SVN for deleting >1000 photos. (Closes: #462798) + + debian/patches/fix_cms_linkage.dpatch: + - Fix from upstream stable SVN branch for linking Cms.dll against + libfspot. + + debian/patches/fix_v8_db_update.dpatch: + - Fix from upstream stable SVN branch for updating from v7 to v8 of the + f-spot photo database. + + debian/patches/fix_gnome-sharp_typo.dpatch: + - Fix from upstream SVN for typo in configure.in. + + debian/patches/gtkhtml-sharp-3.14_port.dpatch: + - Forward port to gtkhtml-sharp-3.14. + + debian/patches/98_autoreconf.dpatch: + - Move all generated changes from other patches into single patch, + for easier maintenance. + * debian/control: + + Recommend dbus-x11. (Closes: #459272) + + Require a version of libgnome2.0-cil >= 2.20. + + Build against libgtkhtml3.16-cil rather than libgtkhtml2.0-cil. + (Closes: #470822) + + -- 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: + + Updated libflickrnet2.1.5-cil build-dependency to >= 25277-5 to ensure + f-spot is linked with an ABI compatible version on all architectures. + (Closes: #458940) + + -- Mirco Bauer Sun, 06 Jan 2008 18:54:46 +0100 + +f-spot (0.4.1-3) unstable; urgency=low + + * debian/control: + + Added beagle to dependencies, it's not handled unfortunely via dh_clideps + as beagle is not using the GAC for the libraries. beagle-dev was added in + 0.4.1-1 as build-dep, but didn't affect f-spot as the beagle version was + too old and thus ignored. (Closes: #458805) + + -- Mirco Bauer Thu, 03 Jan 2008 00:41:13 +0100 + +f-spot (0.4.1-2) unstable; urgency=low + + [ Mirco Bauer ] + * The "Happy New Year!" release + * debian/patches/02_autoreconf.dpatch: + + Dropped + * debian/patches/unlink_nunit.dpatch: + + Don't link with nunit, the users don't want/can't use the test-cases, + but causes unnecesary dependency and produces different build results + depending if nunit was installed or not. + * debian/patches/detect_sqlite2_databases.dpatch + debian/patches/detect_and_upgrade_sqlite2_database.dpatch: + (Closes: #456308) + + Renamed detect_sqlite2_databases.dpatch to + detect_and_upgrade_sqlite2_database.dpatch. + + Made error message less developerish. + + Implemented automatic and silent upgrade of the sqlite database, only + bail out if there was an error. + + Enhanced or rather implemented error handling in the + f-spot-sqlite-upgrade script. + * debian/control: + + Made sqlite and sqlite3 recommends for a while, till all older f-spot + users are migrated to sqlite3. + + Added build dependencies on all libraries the configure script explicitly + checks for, fixes FTBFS. (Closes: #458672) + * debian/menu: + + Changed Apps -> Applications. + + [ Tim Retout ] + * debian/patches/no_dup_apps_icons.dpatch: Adjust Makefiles so as not to + install application icons in two different locations. (Closes: #441326) + + -- Mirco Bauer Tue, 01 Jan 2008 17:47:16 +0100 + +f-spot (0.4.1-1) unstable; urgency=low + + [ Mirco Bauer ] + * New upstream version. + + Fixes NDesk.Glitz FTBFS. (Closes: #441686) + + Fixes crash when double clicking an image or attaching a tag while the + image is open. (Closes: #447986) + * debian/control: + + Added myself to Uploaders. + + Updated cli-common-dev build-dependency to >= 0.4.4. + + Updated Standards-Version to 3.7.3, no changes needed. + + Added sqlite and sqlite3 to Suggests, needed for the + f-spot-sqlite-upgrade script. + + Added libflickrnet2.1.5-cil, libmono-addins0.2-cil and + libmono-addins-gui0.2-cil to build-dependencies. + * debian/copyright: + + Rewritten, checked copyright and licenses of all source files. + * debian/patches/01_build-system.dpatch: + + Disabled as upstream allows to link against system ndesk-dbus now. + * debian/patches/10_cs-changes.dpatch: + + Disabled as PicasaWeb export, .kdc file support and sqlite3 support are + already fixed upstream. + * Added beagle-dev to build-dependencies for beagle support. + * debian/patches/fix_libfspot_linkage.dpatch + debian/patches/fix_libfspoteog_linkage.dpatch + debian/patches/fix_libfspotjpegtran_linkage.dpatch: + + Wrote patch to link correctly against used libraries. + * debian/patches/20_refresh-menus-on-extensions.dpatch: + + Refresh the Export and Tools menus on new or removed extensions. + (upstream SVN revision: 3478) + (thanks to Matvey Kozhev for the dpatch and + investigation) + * debian/patches/link_system_libs.dpatch: + + Link against the Mono.Addins and FlickrNet debian packages instead of the + bundled versions. + * debian/patches/forward_port_to_flickrnet_2.1.5.dpatch: + + API forward port for FlickrNet 2.1.5. + * debian/patches/detect_sqlite2_databases.dpatch: + + Wrote patch to detect an existing sqlite2 database during startup of + f-spot and print out upgrade instructions. + * debian/rules + debian/patches/99_ltmain_as-needed.dpatch: + + Pass --as-needed to linker for lesser dependencies. + + [ Tim Retout ] + * New upstream version. (Closes: #436298, #446409) + * New maintainer. (Closes: #453474) + * Acknowledge NMUs by Margarita Manterola. + (Closes: #435697, #427287, #401647) + * Use dpatch to manage patches. + * debian/watch: Update to look for 0.4.x versions, not 0.1.x. + * debian/control: + + Added myself to Uploaders. + + Add build dependency on dpatch. + + Add new Homepage field. + + Add new Vcs-* fields. + + -- Mirco Bauer Thu, 13 Dec 2007 20:57:10 +0100 + +f-spot (0.3.5-1.2) unstable; urgency=low + + * Non-maintainer upload, to fix spurious Failures to Build From Source. + * Added docbook-xml as a dependency. + * Changed all xsltproc calls to xsltproc --nonet, so that no network is + used while generating the documentation. (Closes: #435697). + + -- Margarita Manterola Thu, 02 Aug 2007 19:13:54 -0300 + +f-spot (0.3.5-1.1) unstable; urgency=low + + * Non-maintainer upload to fix Failure to Build From Source. + * Added libgconf2.0-cil and libglade2.0-cil as Build-Dependencies, + as suggested by Cyril Brulebois. (Closes: #427287). + * Added dbus as a dependency, since F-Spot does not work when dbus is + not present. (Closes: #401647) + + -- Margarita Manterola Wed, 01 Aug 2007 23:18:53 -0300 + +f-spot (0.3.5-1) unstable; urgency=low + + * Upload current Ubuntu package to Debian as a new upstream release + + -- Andrew Mitchell Mon, 7 May 2007 21:49:44 +1200 + +f-spot (0.3.5-0ubuntu2) feisty; urgency=low + + * Support .KDC files as a RAW image type (LP: 91488) + + -- Andrew Mitchell Wed, 21 Mar 2007 23:26:56 +1200 + +f-spot (0.3.5-0ubuntu1) feisty; urgency=low + + * New upstream release + - Fix slideshow with missing images + - More descriptive error when dbus session bus is missing + - Don't show Hidden photos unless asked + * Add fix to google-sharp/PicasaWeb.cs from r3011 to fix PicasaWeb export + + -- Andrew Mitchell Wed, 14 Mar 2007 10:29:37 +1300 + +f-spot (0.3.4-0ubuntu1) feisty; urgency=low + + * New upstream release + * Use system copies of NDesk.DBus instead of using the bundled source + * Add patch from SVN r2790 for LP: #59723 + + -- Andrew Mitchell Mon, 26 Feb 2007 23:07:50 +1300 + +f-spot (0.3.3-0ubuntu1) feisty; urgency=low + + * New upstream release + - Fix the insensitive editors problem. + * Add libgl1-mesa-dev | libgl-dev to Build-Depends to be able to load + libGL.so.1 at run time (LP: #81578) + * Disable scrollkeeper usage in debian/ules + + -- Andrew Mitchell Tue, 6 Feb 2007 11:53:45 +1300 + +f-spot (0.3.2-0ubuntu1) feisty; urgency=low + + * New upstream release + - New editing effects: Soft Focus and Straighten. + - Lots of fixes to the OpenGL slideshow introduced in 0.3.1 + - Export to 23hq.com and SmugMug (Thomas Van Machelen) + - Background color for transparent regions of images can be chosen + in --view mode (Stephane Delcroix) + - New red-eye removal algorithm. Threshold value for redeye removal is + read from gconf. Default is set to -15 (Stephane Delcroix) + - Zero-pad month and days while creating files and directories + (Stephane Delcroix) + - In browse mode hjkl now behave just like left, down, up, right arrow + keys do (Gabriel Burt) + - Accepts dropped URIs from Firefox. Drag an image from Firefox and + drop it in f-spot --view (Stephane Delcroix) + - Fullscreen mode uses overlayed controls, powered by compiz (Larry Ewing) + - Fixes to histogram (Larry Ewing) + - Initial work on color management (Larry Ewing) + - Refactored multi service support (Larry Ewing) + - More work on unit tests (Larry Ewing) + - Other fixes and improvements + + -- Andrew Mitchell Wed, 24 Jan 2007 22:03:15 +1300 + +f-spot (0.3.0-1) unstable; urgency=low + + * New upstream release + - Massive view mode improvements (Stephane Delcroix, Thomas Van Machelen). + - Fix for new Picasa web interface (Stephane Delcroix). + - Integrated unit tests using nunit. + - New multiresolution icons. + - New User Guide (Bengt Thuree, Alexandre Prokoudine and others). + - Query improvements (Gabriel Burt). + + -- Andrew Mitchell Sun, 10 Dec 2006 20:28:28 +1300 + +f-spot (0.3.0-0ubuntu1) feisty; urgency=low + + * New upstream release + - Massive view mode improvements (Stephane Delcroix, Thomas Van Machelen). + - Fix for new Picasa web interface (Stephane Delcroix). + - Integrated unit tests using nunit. + - New multiresolution icons. + - New User Guide (Bengt Thuree, Alexandre Prokoudine and others). + - Query improvements (Gabriel Burt). + + -- Andrew Mitchell Fri, 1 Dec 2006 00:24:28 +1300 + +f-spot (0.2.2-0ubuntu1) feisty; urgency=low + + * Update to 0.2.2 upstream + + -- Andrew Mitchell Tue, 7 Nov 2006 11:27:24 +1300 + +f-spot (0.2.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS, Kudos to Roland Mas and Mirco Bauer for looking + into this and preparing a Patch (Closes: #394142) + + -- Michael Ablassmeier Fri, 27 Oct 2006 12:59:23 +0200 + +f-spot (0.2.1-1ubuntu1) edgy; urgency=low + + * Apply bug fixes from upstream CVS: + - #340901: Close colour dialog on switching to browse mode + - #353801: Tag drag & drop crashing + - #355653: Picasa export UI fix + - #356543: Picasa progressbar UI fix + - #329299: Landscape/portrait constraints while cropping + - #357286: Crash in commandline parsing + - #354621: Update google-sharp for authenticated connections + * Fix screensaver exec line in tools/f-spot-screensaver + + -- Andrew Mitchell Thu, 12 Oct 2006 17:17:16 +1300 + +f-spot (0.2.1-1) unstable; urgency=low + + * New upstream release, incorporating Ubuntu changes + + -- Andrew Mitchell Tue, 3 Oct 2006 11:05:04 +1300 + +f-spot (0.2.1-0ubuntu1) edgy; urgency=low + + * New upstream release (UVF Exception granted as malone #61550) + - Picasa Web album export. + - Fixes for recent mono versions. + - Support for scaling when sending mail. + - Support for exporting the images in correct orientation. + - Improved generation. + - Many more bug fixes. + * Fixes for bashisms merged upstream (Closes: #367459) + * Fix libgphoto-sharp dllmap (Closes: #385979, #389513) + + -- Andrew Mitchell Thu, 21 Sep 2006 13:54:31 +1200 + +f-spot (0.2.0-1ubuntu1) edgy; urgency=low + + * Add libgphoto2_port.so to libgphoto2-sharp.dll.config dllmap + + -- Andrew Mitchell Wed, 6 Sep 2006 19:29:05 +1200 + +f-spot (0.2.0-1) unstable; urgency=low + + * New upstream release + - Initial gnome-vfs --view support. + - Impoved static html and folder export logic. + - Improved loupe. + - Fixes for mono head. + - Many many more fixes see ChangeLog. + * Most patch branches incorporated upstream, remaining are + - ubuntu.01-fix-wrapper: Fix for bashisms + - ubuntu.03-sqlite3-when-new: Create sqlite 3 database by default + - ubuntu.04-screensaver: Set correct screensaver path + * Add f-spot(1) manpage, thanks to Andrew Burton (Closes: #312566) + + -- Andrew Mitchell Fri, 1 Sep 2006 09:16:30 +1200 + +f-spot (0.1.11-3ubuntu5) edgy; urgency=low + + * Update removable metadata patch from upstream (Malone: #42736) + * Update location of screensaver + + -- Andrew Mitchell Sat, 12 Aug 2006 13:52:02 +1200 + +f-spot (0.1.11-3ubuntu4) edgy; urgency=low + + * Apply patch from f-spot-0.1 branch to import rotated images + correctly (Malone: #37972) + + -- Andrew Mitchell Wed, 9 Aug 2006 23:45:48 +1200 + +f-spot (0.1.11-3ubuntu3) edgy; urgency=low + + * Remove dpatch from Build-Depends, rm debian/patched (Malone: #54760) + + -- Andrew Mitchell Tue, 1 Aug 2006 22:02:27 +1200 + +f-spot (0.1.11-3ubuntu2) edgy; urgency=low + + * debian/control: + + Build-Depend on cli-common-dev instead of cli-common to fix FTBFS + + -- Sebastian Dröge Sun, 30 Jul 2006 17:45:19 +0200 + +f-spot (0.1.11-3ubuntu1) edgy; urgency=low + + * Remove unneeded libmono0 & libsqlite* dependencies + + -- Andrew Mitchell Sun, 30 Jul 2006 21:09:40 +1200 + +f-spot (0.1.11-3) unstable; urgency=high + + * Drop use of dpatch, using bzr for patch management now + * Automake fixes for missing .la files (Closes: #377158) + + -- Andrew Mitchell Fri, 21 Jul 2006 14:18:10 +1200 + +f-spot (0.1.11-2) unstable; urgency=low + + * Add libmono-sqlite1.0-cil to Build-Depends (Closes: #364440) + * Fix screensaver script path + * Update to Standards-Version 3.7.2 + + -- Andrew Mitchell Sat, 3 Jun 2006 17:15:39 +1200 + +f-spot (0.1.11-1ubuntu1) dapper; urgency=low + + * Add patch to ignore failure in writing metadata to images + imported from a removable device. Thanks to Chris Wilson for this + - Malone #42736 + * Update 02_f-spot-copy.dpatch from GNOME #326860 + - Malone #38010 + + -- Andrew Mitchell Tue, 16 May 2006 18:17:23 +1200 + +f-spot (0.1.11-1) unstable; urgency=low + + * New upstream release + - Much improved contrast function. + - Database opens existing databases regardless of the sqlite + version. + - Database tries to force the correct encoding on v2 databases. + - Import dialog is better about cleaning up after itself. + - Valid cameras are no longer discarded from the camera list. + - Group selector handles empty groups. + - Many slideshow improvements. + - Fix the erratic open with menu behavior. + - Improve the tag menu behavior when adding tags. + - Add --debug and --uninstalled command line options. + - Fixed JPEG orientation when saving new versions. + - Added a general exception dialog. + - Many many more bugfixes. + Closes: #337240, #338536, #354135, #358954, #358551, #349501 + * Add dcraw to Recommends for RAW image support + * Add patch to fix copying on import + * Use SQLite 3 database format by default + * Thanks to Roland Mas for NMU (Closes: #349501, #354849) + + -- Andrew Mitchell Tue, 4 Apr 2006 22:35:32 +1200 + +f-spot (0.1.10-0ubuntu1) dapper; urgency=low + + * New upstream release + - Script to launch f-spot import based on hal id + - Screensaver wrappers for gnomescreensaver.- New gnome-screensaver mode. + - Timezone utc clean-ups. + - Fixed time dialog set the date properly. + - Expose the sort order to the ui. + - Added cancel button to color dialog + - Fixed memory leak in async loader. + - Many more bugfixes. + + -- Andrew Mitchell Sat, 25 Feb 2006 06:32:13 +1000 + +f-spot (0.1.9-0ubuntu1) dapper; urgency=low + + * New upstream release + - Small import dialog improvements. + - Support for new Flickr API. + - Open With menu. + - Database upgrade path. + - Translated default tag names. + + -- Andrew Mitchell Tue, 14 Feb 2006 11:50:37 +1300 + +f-spot (0.1.8-1) unstable; urgency=low + + * New upstream release + - New icons + - Fixed typos. + - Png metadata support. + - Support for dates before the unix Epoch. + - Improved XMP handing. + - Enhanced time dialog. + * Remove outdated README from debian/docs + + -- Andrew Mitchell Tue, 31 Jan 2006 09:14:12 +1300 + +f-spot (0.1.7-0ubuntu1) dapper; urgency=low + + * New upstream release + - Uses async I/O when loading pictures (Closes: #341790) + * DBUS 0.60 transition (Closes: #348177) + - Drop libdbus-cil from Build-Depends + + -- Andrew Mitchell Thu, 19 Jan 2006 03:40:19 +1300 + +f-spot (0.1.5-1) unstable; urgency=low + + * New upstream release (Closes: #343046) + - Fix comments in Original export. + - Improve Zooming logic, remove the old View->Size menu. + - Keep in the timeline place when removing photos. + - Allow changes to case in tag names. + - Support adding albums to existing galleries. + - Support Gallery 2 in gallery export. + - Added russian translation from Alexsandre Prokoudine. + * Sticking with sqlite2 for now, until a clean upgrade path is found + + -- Andrew Mitchell Thu, 15 Dec 2005 20:58:55 +0000 + +f-spot (0.1.4-1) unstable; urgency=low + + * New upstream release + - Menu rotation is 270 degrees, not 90. Closes (#341791) + * Patches 02_endianness_fix.dpatch & 03_ciff.cs.dpatch dropped, included in upstream release + * Added patch to use sqlite 3 + + -- Andrew Mitchell Fri, 9 Dec 2005 08:48:57 +1300 + +f-spot (0.1.3-3) unstable; urgency=low + + * Update for new maintainer address + * Set watch file to look for 0.1.x versions + + -- Andrew Mitchell Wed, 7 Dec 2005 23:58:52 +1300 + +f-spot (0.1.3-2) experimental; urgency=low + + * Add patch to src/Ciff.cs from CVS (Ciff.cs rev 1.9) + * Merge in Ubuntu changes, use dbus 0.50 + + -- Andrew Mitchell Sat, 26 Nov 2005 00:05:32 +1300 + +f-spot (0.1.3-1ubuntu1.1) breezy-updates; urgency=low + + * Fix big-endian data-loss bug + * Patch from GNOME #319190 (Malone #3338) + + -- Andrew Mitchell Thu, 20 Oct 2005 09:31:10 +1300 + +f-spot (0.1.3-1ubuntu1) breezy; urgency=low + + * Change {Build-,}Depends back to libdbus-1-cil for breezy + + -- Andrew Mitchell Fri, 30 Sep 2005 01:09:20 +1200 + +f-spot (0.1.3-1) unstable; urgency=low + + * New upstream release (Closes: #301152, #311871, #330461) + * Rebuild for gtk# 2.3.91 + * Andrew Mitchell + - Add Depends on libdbus-cil + - Updated debian/patches/01_fix_wrapper.dpatch to match upstream changes + + -- Debian Mono Group Thu, 29 Sep 2005 23:33:44 +0000 + +f-spot (0.1.2-0ubuntu1) breezy; urgency=low + + * New upstream release + * Andrew Mitchell + - Add Depends on libdbus-1-cil + - Update for cli-common 0.2.0 + + -- Debian Mono Group Thu, 8 Sep 2005 21:55:04 +0000 + +f-spot (0.1.1-2) unstable; urgency=low + + * Andrew Mitchell + - Add libsqlite0 to Depends (Closes: #325375, #325762) + + -- Debian Mono Group Tue, 30 Aug 2005 22:27:05 +0000 + +f-spot (0.1.1-1) unstable; urgency=low + + * Andrew Mitchell + - New upstream version + - F-Spot now uses GTK# 2.0, updated Build-Depends to libgnome2.0-cil (Closes: #316776) + - Removed gnome-pkg-tools from Build-Depends + + -- Debian Mono Group Mon, 22 Aug 2005 22:04:52 +0000 + +f-spot (0.1.0-1) unstable; urgency=low + + * New upstream version + + -- Debian Mono Group Mon, 15 Aug 2005 21:03:42 +0000 + +f-spot (0.0.13-4) unstable; urgency=low + + * Andrew Mitchell + + debian/control: + - New Maintainer (Debian Mono Group) + - Rebuild with newer libexif-dev & removed explicit Depends on libexif10, libgphoto2-2 (Closes: #321310) + - Removed unneeded control.in & uploaders + - Removed extra dh_clideps arguments + - Added dpatch build dependency + - Updated to Standards Version 3.6.2 (no changes needed) + + debian/rules: + - Changed simple-patchsys.mk to dpatch.mk + - Added unpatch target for dpatch + + debian/dirs: + - Remove unneeded directories from debian/dirs + + debian/watch: + - Added + + -- Debian Mono Group Wed, 10 Aug 2005 19:44:27 +1200 + +f-spot (0.0.13-3) unstable; urgency=low + + * Fix FTBFS on amd64 (add MONO_SHARED_DIR to debian/rules (Closes: #314515) + Thanks to Brandon Hale. + + -- Ondřej Surý Mon, 20 Jun 2005 21:48:14 +0200 + +f-spot (0.0.13-2) unstable; urgency=low + + * Change ${net:Depends} to ${cli:Depends} to get dependencies right (Closes: #311721) + + -- Ondřej Surý Fri, 3 Jun 2005 08:34:57 +0200 + +f-spot (0.0.13-1ubuntu1) unstable; urgency=low + + * Synchronize with Debian. + * We are now hosted on pkg-mono/non-group/f-spot on svn.debian.org + + -- Brandon Hale Fri, 3 Jun 2005 06:22:37 -0400 + +f-spot (0.0.13-1) unstable; urgency=low + + * New upstream relase + * Updated for mono 1.1 (Closes: #311473) + + -- OndÅ™ej Surý Thu, 2 Jun 2005 08:42:59 +0200 + +f-spot (0.0.13-0ubuntu1) breezy; urgency=low + + * New upstream release + + 00_MonoConventions.patch dropped + + debian/rules - de-/usr/share/dotnet + + Move from dh_netdeps to dh_clideps and s/mono-utils/cli-common in + build-dep + + -- Brandon Hale Fri, 13 May 2005 21:36:29 -0400 + +f-spot (0.0.12-1) unstable; urgency=low + + * New upstream release (Closes: #305016) + + -- OndÅ™ej Surý Mon, 18 Apr 2005 09:02:33 +0200 + +f-spot (0.0.12-0ubuntu1) hoary; urgency=low + + * New upstream release + + -- Brandon Hale Sat, 19 Mar 2005 22:25:22 -0500 + +f-spot (0.0.11-1) unstable; urgency=low + + * New upstream release + * Update 00_MonoConventions.patch + + -- Brandon Hale Tue, 15 Mar 2005 09:43:14 -0500 + +f-spot (0.0.10-1) unstable; urgency=low + + * New upstream release + + -- Brandon Hale Sun, 6 Mar 2005 15:53:29 -0500 + +f-spot (0.0.9-3) unstable; urgency=low + + * [Brandon] Update 01_fspot-config.patch to also dllmap libexif.so.10 + * [Ondrej] Bump build dependency on mono-utils to version 1.0 + + -- Ondřej Surý Thu, 24 Feb 2005 08:26:05 +0100 + +f-spot (0.0.9-2) unstable; urgency=low + + * Fix misspeled dependency. + + -- Ondřej Surý Wed, 23 Feb 2005 13:05:18 +0100 + +f-spot (0.0.9-1) unstable; urgency=low + + * New upstream release. + * Fix missing dependencies (Closes: #296372, #296541) + * Use Brandon Hale package as base for mine. + + -- Ondřej Surý Wed, 23 Feb 2005 08:50:06 +0100 + +f-spot (0.0.8-3) unstable; urgency=low + + * Add a libgphoto2-sharp.dll.config to remap libgphoto2.so to libgphoto2.so.2 + + -- Brandon Hale Sun, 20 Feb 2005 15:56:07 -0500 + +f-spot (0.0.8-2) unstable; urgency=low + + * liblcms1-dev to debian/control.in, not debian/control + + -- Brandon Hale Sat, 19 Feb 2005 07:39:02 -0500 + +f-spot (0.0.8-1) unstable; urgency=low + + * New upstream release + + -- Brandon Hale Thu, 17 Feb 2005 18:09:48 -0500 + +f-spot (0.0.3-2) unstable; urgency=low + + * Update f-spot.exe.config to include mapping for internal libraries + (Closes: #283469) + + -- Ondřej Surý Wed, 15 Dec 2004 11:45:53 +0100 + +f-spot (0.0.3-1) unstable; urgency=low + + * New upstream release. (Closes: #283183) + + -- Ondřej Surý Sun, 28 Nov 2004 18:41:11 +0100 + +f-spot (0.0.2-1) unstable; urgency=low + + * Initial Release. (Closes: #239558) + + -- Ondřej Surý Sat, 4 Sep 2004 21:32:52 +0200 + --- f-spot-0.5.0.3.orig/debian/control +++ f-spot-0.5.0.3/debian/control @@ -0,0 +1,66 @@ +Source: f-spot +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian CLI Applications Team +Uploaders: Tim Retout , Mirco Bauer , Iain Lane +Build-Depends: debhelper (>= 5.0.0), + cli-common-dev (>= 0.5.4), + cdbs, + dpatch, + mono-devel (>= 2.0), + libgtk2.0-dev (>= 2.6), + libgtk2.0-cil (>= 2.8), + gtk-sharp2-gapi, + libgnome2-dev (>= 2.2), + libgnome2.24-cil, + libgtkhtml3.16-cil (>= 2.20), + libmono-dev (>= 1.2.4), + libmono-sqlite2.0-cil, + libmono-system-runtime2.0-cil, + libcairo2-dev, + libmono-cairo2.0-cil, + libmono-addins0.2-cil (>= 0.4), + libmono-addins-gui0.2-cil (>= 0.4), + libndesk-dbus1.0-cil (>= 0.4.2), + libndesk-dbus-glib1.0-cil (>= 0.3.0), + libgconf2.24-cil, + libglade2.0-cil, + libgnome-vfs2.24-cil, + libflickrnet2.1.5-cil (>= 25277-5), + libgnome-keyring1.0-cil, + liblcms1-dev, + libgnomeui-dev (>= 2.2), + libexif-dev (>= 0.5.7), + libusb-dev, + libsqlite3-dev, + libgphoto2-2-dev (>= 2.1.4), + libgl1-mesa-dev | libgl-dev, + libglu1-mesa-dev, + libglitz1-dev, + libglitz-glx1-dev, + libjpeg62-dev, + libxml-parser-perl, + gtk-sharp2-gapi, + gnome-screensaver, + gnome-doc-utils (>= 0.3.2), + docbook-xml, + intltool, + libtool, + autoconf, + automake1.10 +Standards-Version: 3.8.0 +Homepage: http://www.f-spot.org/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/f-spot/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/ + +Package: f-spot +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, dbus, gvfs-bin +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 + tools to help you share, touch-up, find and organize your images. + It allows for importing of your existing photo collections, tagging photos + with identifiers, as well as doing simple edits of photos (e.g. rotating). --- f-spot-0.5.0.3.orig/debian/rules +++ f-spot-0.5.0.3/debian/rules @@ -0,0 +1,50 @@ +#! /usr/bin/make -f + +#export DH_VERBOSE=1 +export MONO_SHARED_DIR=$(CURDIR) + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/dpatch.mk +# needed to use the dpatch tools (like dpatch-edit-patch) +include /usr/share/dpatch/dpatch.make + +VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2) +UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,') + +export DEB_DH_MAKESHLIBS_ARGS="-n" + +CFLAGS := -Wall -g + +DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1 -Wl,--as-needed" +DEB_CONFIGURE_USER_FLAGS += MCS=/usr/bin/csc CSC=/usr/bin/csc +DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper + +DEB_AUTO_UPDATE_ACLOCAL = 1.10 +DEB_AUTO_UPDATE_LIBTOOL = pre +DEB_AUTO_UPDATE_AUTOCONF = true +DEB_AUTO_UPDATE_AUTOMAKE = 1.10 + +common-configure-indep:: + mkdir -p $(MONO_SHARED_DIR)/.wapi + +binary-predeb/f-spot:: + dh_clideps -d + +binary-install/f-spot:: + rm $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a \ + $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la \ + $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so + cp $(CURDIR)/debian/NDesk.Glitz.dll.config \ + $(CURDIR)/debian/f-spot/usr/lib/f-spot/ + +clean:: + rm -rf $(MONO_SHARED_DIR)/.wapi + +get-orig-source: + [ -d ../tarballs ] || mkdir ../tarballs + uscan \ + --force-download \ + --download-version $(UPVERSION) \ + --rename \ + --destdir ../tarballs --- f-spot-0.5.0.3.orig/debian/menu +++ f-spot-0.5.0.3/debian/menu @@ -0,0 +1,2 @@ +?package(f-spot):needs="X11" section="Applications/Viewers" \ + title="F-Spot" command="/usr/bin/f-spot" --- f-spot-0.5.0.3.orig/debian/NDesk.Glitz.dll.config +++ f-spot-0.5.0.3/debian/NDesk.Glitz.dll.config @@ -0,0 +1,4 @@ + + + + --- f-spot-0.5.0.3.orig/debian/f-spot.1 +++ f-spot-0.5.0.3/debian/f-spot.1 @@ -0,0 +1,26 @@ +.TH "f-spot" "1" +.SH "NAME" +f-spot \- A program to manage a photo collection +.SH "SYNOPSIS" +\fBf-spot [\fIoption\fB] +.SH "DESCRIPTION" +.B f-spot +is a program that manages a photo collection, with the ability to import directly from a digital camera. +.SH "OPTIONS" +.IP "\-\-view \fIFILE OR DIRECTORY\fR\fP" 10 +View a specified image or directory +.IP "\-\-import \fIURI\fR\fP" 10 +Import from the given URI +.IP "\-\-slideshow\fP" 10 +Display a slideshow +.IP "\-\-shutdown\fP" 10 +Shutdown a running f-spot server +.IP "\-\-debug\fP" 10 +Run f-spot with mono in debug mode +.IP "\-?, \-\-help\fP" 10 +Show help message +.IP "\-\-usage\fP" 10 +Display brief usage message +.SH "AUTHOR" +.PP +This manual page was written by Andrew Burton adb@iinet.net.au for the \fBDebian GNU/Linux\fP system (but may be used by others). --- f-spot-0.5.0.3.orig/debian/manpages +++ f-spot-0.5.0.3/debian/manpages @@ -0,0 +1 @@ +debian/f-spot.1 --- f-spot-0.5.0.3.orig/debian/docs +++ f-spot-0.5.0.3/debian/docs @@ -0,0 +1,2 @@ +NEWS +TODO --- f-spot-0.5.0.3.orig/debian/compat +++ f-spot-0.5.0.3/debian/compat @@ -0,0 +1 @@ +5 --- f-spot-0.5.0.3.orig/debian/patches/debian_no-dup-app-icons.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_no-dup-app-icons.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## no_dup_apps_icons.dpatch by Tim Retout +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not install application icons under /usr/share/f-spot. + +@DPATCH@ +diff -urNad trunk~/icons/Makefile.am trunk/icons/Makefile.am +--- trunk~/icons/Makefile.am 2007-12-04 12:19:26.000000000 +0000 ++++ trunk/icons/Makefile.am 2007-12-25 14:45:47.000000000 +0000 +@@ -54,11 +54,6 @@ + actions,view-restore-22.png \ + actions,view-restore-24.png \ + actions,view-restore-32.png \ +- apps,f-spot.svg \ +- apps,f-spot-16.png \ +- apps,f-spot-22.png \ +- apps,f-spot-24.png \ +- apps,f-spot-32.png \ + devices,camera-photo-16.png \ + devices,camera-photo-22.png \ + devices,camera-photo-24.png \ --- f-spot-0.5.0.3.orig/debian/patches/ubuntu_importer-targetdir-selector.dpatch +++ f-spot-0.5.0.3/debian/patches/ubuntu_importer-targetdir-selector.dpatch @@ -0,0 +1,89 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu_importer-targetdir-selector.dpatch by Chris Coulson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +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; + [Widget] Gtk.CheckButton duplicate_check; ++ [Widget] Gtk.FileChooserButton dest_dir_chooser; + + GPhotoCamera camera; + ListStore preview_list_store; +@@ -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); + + GetPreviews (); + } +@@ -279,7 +283,11 @@ + + return new SaveResult (path, true); + } else { +- 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); + + return new SaveResult (dest, false); +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 @@ + + + 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 ++ ++ ++ + + True + True --- f-spot-0.5.0.3.orig/debian/patches/debian_libfspoteog-linkage.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_libfspoteog-linkage.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_libfspoteog_linkage.dpatch by Mirco Bauer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.4.1~/libeog/Makefile.am f-spot-0.4.1/libeog/Makefile.am +--- f-spot-0.4.1~/libeog/Makefile.am 2007-12-10 00:06:42.000000000 +0100 ++++ f-spot-0.4.1/libeog/Makefile.am 2007-12-10 00:07:08.000000000 +0100 +@@ -44,6 +44,7 @@ + + libfspoteog_la_SOURCES = $(libfspoteog_files) + ++libfspoteog_la_LIBADD = $(F_LIBS) $(LCMS_LIBS) + + # GLib marshalling cruft + --- f-spot-0.5.0.3.orig/debian/patches/debian_unlink-nunit.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_unlink-nunit.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian_unlink_nunit.dpatch by Mirco Bauer +## ported to new upstream by Chris Coulson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.5.0.2~/src/Makefile.am f-spot-0.5.0.2/src/Makefile.am +--- f-spot-0.5.0.2~/src/Makefile.am 2008-09-29 13:42:00.000000000 +0100 ++++ f-spot-0.5.0.2/src/Makefile.am 2008-10-06 18:48:23.000000000 +0100 +@@ -277,7 +277,6 @@ + endif + + CMS_ASSEMBLIES = \ +- $(NUNIT_PKG) \ + -pkg:gtk-sharp-2.0 + + CORE_ASSEMBLIES = \ +@@ -333,7 +332,6 @@ + -r:FSpot.JobScheduler.dll \ + -r:FSpot.Widgets.dll \ + -r:Cms.dll \ +- $(NUNIT_PKG) \ + $(GCONF_PKG) \ + $(GTKHTML_SHARP_PKG) \ + -pkg:glade-sharp-2.0 \ --- f-spot-0.5.0.3.orig/debian/patches/debian_link-system-flickrnet.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_link-system-flickrnet.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## link_system_flickrnet.dpatch by Tim Retout +## ported to new upstream by Chris Coulson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Link against system flickrnet-2.1.5 rather than bundled f-spot version. + +@DPATCH@ +diff -urNad f-spot-0.5.0.2~/configure.in f-spot-0.5.0.2/configure.in +--- f-spot-0.5.0.2~/configure.in 2008-10-06 18:54:39.000000000 +0100 ++++ f-spot-0.5.0.2/configure.in 2008-10-06 18:55:44.000000000 +0100 +@@ -366,7 +366,6 @@ + extensions/Exporters/CDExport/Makefile + extensions/Exporters/DefaultExporters/Makefile + extensions/Exporters/FlickrExport/Makefile +-extensions/Exporters/FlickrExport/FlickrNet/Makefile + extensions/Exporters/GalleryExport/Makefile + extensions/Exporters/FacebookExport/Makefile + extensions/Exporters/FolderExport/Makefile +diff -urNad f-spot-0.5.0.2~/extensions/Exporters/FlickrExport/Makefile.am f-spot-0.5.0.2/extensions/Exporters/FlickrExport/Makefile.am +--- f-spot-0.5.0.2~/extensions/Exporters/FlickrExport/Makefile.am 2008-09-26 09:27:39.000000000 +0100 ++++ f-spot-0.5.0.2/extensions/Exporters/FlickrExport/Makefile.am 2008-10-06 18:58:12.000000000 +0100 +@@ -15,16 +15,13 @@ + -r:$(top_builddir)/src/FSpot.Core.dll \ + -r:$(top_builddir)/src/FSpot.Utils.dll \ + $(LINK_SEMWEB) \ +- -r:FlickrNet/FlickrNet.dll \ + -r:Mono.Posix + + PKGS = \ ++ -pkg:flickrnet-2.1.5 \ + -pkg:gtk-sharp-2.0 \ + -pkg:glade-sharp-2.0 + +-SUBDIRS = \ +- FlickrNet +- + RESOURCES = \ + -resource:$(srcdir)/$(PLUGIN_MANIFEST) \ + -resource:$(srcdir)/$(PLUGIN_NAME).glade +@@ -35,7 +32,6 @@ + mautil p $(PLUGIN_ASSEMBLY) + + $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST) +- $(MAKE) -C $(SUBDIRS) + $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES) + + plugindir = $(pkglibdir)/extensions --- f-spot-0.5.0.3.orig/debian/patches/debian_link-system-gnome-keyring.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_link-system-gnome-keyring.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian_link-system-gnome-keyring.dpatch by Mirco Bauer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.4.3.1~/Makefile.am f-spot-0.4.3.1/Makefile.am +--- f-spot-0.4.3.1~/Makefile.am 2008-05-02 17:05:24.000000000 +0200 ++++ f-spot-0.4.3.1/Makefile.am 2008-05-02 17:09:34.000000000 +0200 +@@ -3,7 +3,6 @@ + $(DIR_DBUS_GLIB)\ + docs \ + glitz-sharp \ +- gnome-keyring-sharp \ + icons \ + libeog \ + libjpegtran \ +@@ -21,7 +20,6 @@ + dbus-sharp-glib \ + docs \ + glitz-sharp \ +- gnome-keyring-sharp \ + icons \ + libeog \ + libjpegtran \ +diff -urNad f-spot-0.4.3.1~/Makefile.include f-spot-0.4.3.1/Makefile.include +--- f-spot-0.4.3.1~/Makefile.include 2008-05-02 17:05:24.000000000 +0200 ++++ f-spot-0.4.3.1/Makefile.include 2008-05-02 17:09:09.000000000 +0200 +@@ -24,7 +24,7 @@ + + ## Links + +-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll ++LINK_KEYRING = -pkg:gnome-keyring-sharp + LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll + LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll + LINK_MONO_ADDINS = \ --- f-spot-0.5.0.3.orig/debian/patches/99_ltmain_as-needed.dpatch +++ f-spot-0.5.0.3/debian/patches/99_ltmain_as-needed.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ +diff -urNad f-spot-0.4.1~/ltmain.sh f-spot-0.4.1/ltmain.sh +--- f-spot-0.4.1~/ltmain.sh 2007-12-13 21:22:03.000000000 +0100 ++++ f-spot-0.4.1/ltmain.sh 2007-12-13 21:23:49.000000000 +0100 +@@ -1794,6 +1794,11 @@ + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2134,6 +2139,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- f-spot-0.5.0.3.orig/debian/patches/debian_fix-distclean.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_fix-distclean.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_distclean.dpatch by Mirco Bauer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.4.3.1~/Makefile.am f-spot-0.4.3.1/Makefile.am +--- f-spot-0.4.3.1~/Makefile.am 2008-05-02 17:15:38.000000000 +0200 ++++ f-spot-0.4.3.1/Makefile.am 2008-05-02 17:20:17.000000000 +0200 +@@ -72,7 +72,6 @@ + intltool-extract \ + intltool-merge \ + intltool-update \ +- gnome-doc-utils.make \ + $(desktop_files) + + DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --- f-spot-0.5.0.3.orig/debian/patches/debian_link_2.0_profile_cairo.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_link_2.0_profile_cairo.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian_link_2.0_profile_cairo.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: The libmono-cairo2.0-cil package does not ship mono-cario.pc +## DP: This is waiting for the Mono 2.0 transition to be completed +## DP: Until then, manually link with -r:Mono.Cairo + +@DPATCH@ +diff -urNad f-spot-0.5.0.3~/configure.in f-spot-0.5.0.3/configure.in +--- f-spot-0.5.0.3~/configure.in 2008-10-18 05:54:15.000000000 +1100 ++++ f-spot-0.5.0.3/configure.in 2009-01-25 10:42:16.956459186 +1100 +@@ -69,7 +69,8 @@ + LCMS_REQUIRED=1.12 + dnl -- LIBGPHOTO2_REQUIRED=2.1.4 + +-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED) ++PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED) ++F_LIBS="$F_LIBS -r:Mono.Cairo" + AC_SUBST(F_CFLAGS) + AC_SUBST(F_LIBS) + +@@ -120,9 +121,7 @@ + if pkg-config --atleast-version=2.0 mono; then + CSC_DEFINES="$CSC_DEFINES -d:MONO_2_0" + fi +-if pkg-config --atleast-version=1.2.5 mono-cairo; then +- CSC_DEFINES="$CSC_DEFINES -d:CAIRO_1_2_5" +-fi ++CSC_DEFINES="$CSC_DEFINES -d:CAIRO_1_2_5" + + dnl - Choose PreferenceBackend (default to gconf) + AC_ARG_ENABLE([gconf],[AC_HELP_STRING([--disable-gconf], [build without gconf preference backend])],,) --- f-spot-0.5.0.3.orig/debian/patches/svn-r4555_fix-crash-on-icon-size-change.dpatch +++ f-spot-0.5.0.3/debian/patches/svn-r4555_fix-crash-on-icon-size-change.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## svn-r4555_fix-crash-on-icon-size-change.dpatch by Chris Coulson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch backported from SVN trunk revisions 4555 and 4556 +## DP: Launchpad bug: https://bugs.launchpad.net/f-spot/+bug/291189 +## DP: Gnome bug: http://bugzilla.gnome.org/show_bug.cgi?id=557793 + +@DPATCH@ +diff -urNad f-spot-0.5.0.3~/src/Core/Tag.cs f-spot-0.5.0.3/src/Core/Tag.cs +--- f-spot-0.5.0.3~/src/Core/Tag.cs 2008-08-31 09:52:18.000000000 +0100 ++++ f-spot-0.5.0.3/src/Core/Tag.cs 2008-11-04 17:39:37.000000000 +0000 +@@ -108,6 +108,9 @@ + if (Math.Max (cached_icon.Width, cached_icon.Height) <= (int) tag_icon_size) + return cached_icon; + } ++ if (icon == null) ++ return null; ++ + if (Math.Max (icon.Width, icon.Height) >= (int) tag_icon_size) { //Don't upscale + if (cached_icon != null) + cached_icon.Dispose (); +diff -urNad f-spot-0.5.0.3~/src/TagSelectionWidget.cs f-spot-0.5.0.3/src/TagSelectionWidget.cs +--- f-spot-0.5.0.3~/src/TagSelectionWidget.cs 2008-09-26 09:27:39.000000000 +0100 ++++ f-spot-0.5.0.3/src/TagSelectionWidget.cs 2008-11-04 17:37:19.000000000 +0000 +@@ -192,7 +192,7 @@ + SetBackground (renderer, tag); + + // FIXME I can't set the Pixbuf to null, not sure if it's a GTK# bug... +- if (tag.Icon != null) { ++ if (tag.SizedIcon != null) { + if (FSpot.ColorManagement.IsEnabled) { + //FIXME + Gdk.Pixbuf temp = tag.SizedIcon.Copy(); --- f-spot-0.5.0.3.orig/debian/patches/debian_libfspot-linkage.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_libfspot-linkage.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_libfspot_linkage.dpatch by Mirco Bauer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.4.1~/libfspot/Makefile.am f-spot-0.4.1/libfspot/Makefile.am +--- f-spot-0.4.1~/libfspot/Makefile.am 2007-12-10 00:15:27.000000000 +0100 ++++ f-spot-0.4.1/libfspot/Makefile.am 2007-12-10 00:17:55.000000000 +0100 +@@ -30,6 +30,8 @@ + f-utils.h + + libfspot_la_LIBADD = \ ++ -lX11 \ ++ $(F_LIBS) \ + $(LCMS_LIBS) \ + $(EXIF_LIBS) \ + $(top_builddir)/libjpegtran/libfspotjpegtran.la \ --- f-spot-0.5.0.3.orig/debian/patches/ubuntu_1024x600_CDExport.cs.dpatch +++ f-spot-0.5.0.3/debian/patches/ubuntu_1024x600_CDExport.cs.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu_1024x600_CDExport.cs.dpatch by > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: http://bugzilla.gnome.org/show_bug.cgi?id=569183 + +@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 (); --- f-spot-0.5.0.3.orig/debian/patches/debian_optional-beagle.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_optional-beagle.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## optional_beagle.dpatch by Mirco Bauer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.4.3.1~/src/BeagleNotifier.cs f-spot-0.4.3.1/src/BeagleNotifier.cs +--- f-spot-0.4.3.1~/src/BeagleNotifier.cs 2008-05-02 16:50:23.000000000 +0200 ++++ f-spot-0.4.3.1/src/BeagleNotifier.cs 2008-05-02 16:57:12.000000000 +0200 +@@ -3,8 +3,33 @@ + + namespace FSpot { + public static class BeagleNotifier { ++ static bool BeagleSupport; ++ ++ static BeagleNotifier () { ++ try { ++ if (System.Reflection.Assembly.Load ("Beagle") != null) { ++ BeagleSupport = true; ++ return; ++ } ++ } catch (System.Exception) { ++ } ++ ++ BeagleSupport = false; ++ System.Console.WriteLine ("Beagle.dll not found, disabled beagle support."); ++ } ++ + public static void SendUpdate (IBrowsableItem item) + { ++ if (!BeagleSupport) { ++ return; ++ } ++ ++ SendBeagleUpdate (item); ++ } ++ ++ static void SendBeagleUpdate (IBrowsableItem item) ++ { ++ + Indexable indexable = new Indexable (item.DefaultVersionUri); + indexable.Type = IndexableType.PropertyChange; + Beagle.Property prop; --- f-spot-0.5.0.3.orig/debian/patches/00list +++ f-spot-0.5.0.3/debian/patches/00list @@ -0,0 +1,26 @@ +# Patches that haven't been applied upstream yet. +debian_fix-distclean +debian_libfspot-linkage +debian_libfspoteog-linkage +debian_libfspotjpegtran-linkage +debian_unlink-nunit +debian_no-dup-app-icons +debian_link-system-mono-addins +debian_link-system-flickrnet +debian_link-system-gnome-keyring +debian_fix_f-spot.exe.config +f-spot-import-gphoto +svn-r4555_fix-crash-on-icon-size-change.dpatch + +debian_use_csc +debian_link_2.0_profile_cairo + +ubuntu_importer-targetdir-selector +ubuntu_fname_quote_percent +svn-r4545_locales-import +ubuntu_1024x600_CDExport.cs.dpatch +ubuntu_fix_export_crash_FlickrRemote.cs.dpatch +ubuntu_nofuse_fix_photo_import.dpatch + +# Patches to be applied last. +99_ltmain_as-needed --- f-spot-0.5.0.3.orig/debian/patches/ubuntu_nofuse_fix_photo_import.dpatch +++ f-spot-0.5.0.3/debian/patches/ubuntu_nofuse_fix_photo_import.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu_nofuse_fix_photo_import.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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 --- f-spot-0.5.0.3.orig/debian/patches/debian_fix_f-spot.exe.config.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_fix_f-spot.exe.config.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian_fix_f-spot.exe.config.dpatch by Mirco Bauer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.4.4~/src/f-spot.exe.config.in f-spot-0.4.4/src/f-spot.exe.config.in +--- f-spot-0.4.4~/src/f-spot.exe.config.in 2008-05-07 14:35:26.000000000 +0200 ++++ f-spot-0.4.4/src/f-spot.exe.config.in 2008-07-02 01:11:48.000000000 +0200 +@@ -14,4 +14,5 @@ + + + ++ + --- f-spot-0.5.0.3.orig/debian/patches/debian_link-system-mono-addins.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_link-system-mono-addins.dpatch @@ -0,0 +1,59 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## link_system_libs.dpatch by Mirco Bauer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Link against system libraries in preference to versions bundled in the +## DP: f-spot tarball. + +@DPATCH@ +diff -urNad f-spot~/Makefile.am f-spot/Makefile.am +--- f-spot~/Makefile.am 2008-04-16 22:08:41.000000000 +0100 ++++ f-spot/Makefile.am 2008-04-16 22:08:42.000000000 +0100 +@@ -11,7 +11,6 @@ + libgphoto2-sharp \ + semweb \ + Tao \ +- mono-addins \ + tools \ + po \ + src \ +@@ -30,7 +29,6 @@ + libgphoto2-sharp \ + semweb \ + Tao \ +- mono-addins \ + tools \ + po \ + src \ +diff -urNad f-spot~/Makefile.include f-spot/Makefile.include +--- f-spot~/Makefile.include 2008-04-16 22:07:51.000000000 +0100 ++++ f-spot/Makefile.include 2008-04-16 22:08:42.000000000 +0100 +@@ -27,10 +27,10 @@ + LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll + LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll + LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll +-LINK_MONO_ADDINS = \ +- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \ +- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \ +- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll ++LINK_MONO_ADDINS = \ ++ -pkg:mono-addins \ ++ -pkg:mono-addins-setup \ ++ -pkg:mono-addins-gui + LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll + LINK_TAO = \ + -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \ +diff -urNad f-spot~/configure.in f-spot/configure.in +--- f-spot~/configure.in 2008-04-16 22:08:41.000000000 +0100 ++++ f-spot/configure.in 2008-04-16 22:09:09.000000000 +0100 +@@ -283,10 +283,6 @@ + libjpegtran/Makefile + libfspot/Makefile + libgphoto2-sharp/Makefile +-mono-addins/Makefile +-mono-addins/Mono.Addins/Makefile +-mono-addins/Mono.Addins.Gui/Makefile +-mono-addins/Mono.Addins.Setup/Makefile + semweb/Makefile + tools/Makefile + po/Makefile.in --- f-spot-0.5.0.3.orig/debian/patches/debian_use_csc.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_use_csc.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## mono_transition_use_csc.dpatch by Iain Lane +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch build system to use compiler from MCS variable instead of hardcoded gmcs. Part of mono 2.0 transition. + +@DPATCH@ +diff -urNad f-spot-0.5.0.3~/Makefile.include f-spot-0.5.0.3/Makefile.include +--- f-spot-0.5.0.3~/Makefile.include 2008-07-08 12:01:42.000000000 +0100 ++++ f-spot-0.5.0.3/Makefile.include 2008-11-30 20:27:01.000000000 +0000 +@@ -40,8 +40,8 @@ + ## Build + + CSC_FLAGS = -debug +-CSC = gmcs $(CSC_FLAGS) -target:exe +-CSC_LIB = gmcs $(CSC_FLAGS) -target:library ++CSC = $(MCS) $(CSC_FLAGS) -target:exe ++CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library + + ## Runtime + +diff -urNad f-spot-0.5.0.3~/configure.in f-spot-0.5.0.3/configure.in +--- f-spot-0.5.0.3~/configure.in 2008-10-17 19:54:15.000000000 +0100 ++++ f-spot-0.5.0.3/configure.in 2008-11-30 20:26:23.000000000 +0000 +@@ -315,7 +315,7 @@ + AC_SUBST(CPPFLAGS) + AC_SUBST(LDFLAGS) + +-CSC=gmcs ++CSC=$(MCS) + AC_SUBST(CSC) + + expanded_libdir=`( case $prefix in NONE) prefix=$ac_default_prefix ;; *) ;; esac --- f-spot-0.5.0.3.orig/debian/patches/f-spot-import-gphoto.dpatch +++ f-spot-0.5.0.3/debian/patches/f-spot-import-gphoto.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## f-spot-import-gphoto.dpatch by Martin Pitt +## +## DP: Fix f-spot-import to understand GIO gphoto:// URLs. Also speculatively +## DP: gvfs-umount the camera, otherwise F-Spot cannot communicate with it. +## DP: (Gnome #551803) +@DPATCH@ +diff -urNad f-spot-0.5.0.2~/tools/f-spot-import f-spot-0.5.0.2/tools/f-spot-import +--- f-spot-0.5.0.2~/tools/f-spot-import 2008-07-08 13:01:43.000000000 +0200 ++++ f-spot-0.5.0.2/tools/f-spot-import 2008-10-16 10:05:56.000000000 +0200 +@@ -1,6 +1,21 @@ + #!/bin/bash + + udi="$1" ++ ++if [ "$udi" != "${udi#gphoto2:}" ]; then ++ # gphoto gvfs source, pass it on unmodified ++ ++ # make sure it's not mounted by gvfs, otherwise we can't access the camera ++ # (current F-Spot version does not yet understand GIO) ++ gvfs-mount -u "$udi" || true ++ ++ # transform GIO URL to a format f-spot understands ++ uri=`echo "$udi" | sed 's_://\[_:_; s_/$__; s_\]$__'` ++ ++ exec f-spot --import "$uri" ++ exit 1 ++fi ++ + #xmessage $udi + mount_point=`hal-get-property --udi="$udi" --key=volume.mount_point` + if [ -n "$mount_point" ]; then --- f-spot-0.5.0.3.orig/debian/patches/ubuntu_fname_quote_percent.dpatch +++ f-spot-0.5.0.3/debian/patches/ubuntu_fname_quote_percent.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu_fname_quote_percent.dpatch by +## +## DP: Escape '%' in file names. +## DP: http://bugzilla.gnome.org/show_bug.cgi?id=433829, +## DP: https://launchpad.net/bugs/258083 + +@DPATCH@ +diff -urNad f-spot-0.4.4~/src/Utils/UriUtils.cs f-spot-0.4.4/src/Utils/UriUtils.cs +--- f-spot-0.4.4~/src/Utils/UriUtils.cs 2008-05-20 14:56:44.000000000 +0200 ++++ f-spot-0.4.4/src/Utils/UriUtils.cs 2008-09-29 17:18:01.000000000 +0200 +@@ -49,7 +49,7 @@ + #endif + } + +- static char[] CharsToQuote = { ';', '?', ':', '@', '&', '=', '$', ',', '#' }; ++ static char[] CharsToQuote = { ';', '?', ':', '@', '&', '=', '$', ',', '#', '%' }; + // NOTE: this was copied from mono's System.Uri where it is internal. + public static string EscapeString (string str, bool escapeReserved, bool escapeHex, bool escapeBrackets) + { --- f-spot-0.5.0.3.orig/debian/patches/debian_libfspotjpegtran-linkage.dpatch +++ f-spot-0.5.0.3/debian/patches/debian_libfspotjpegtran-linkage.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_libfspotjpegtran_linkage.dpatch by Mirco Bauer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad f-spot-0.4.1~/libjpegtran/Makefile.am f-spot-0.4.1/libjpegtran/Makefile.am +--- f-spot-0.4.1~/libjpegtran/Makefile.am 2007-12-04 13:19:23.000000000 +0100 ++++ f-spot-0.4.1/libjpegtran/Makefile.am 2007-12-09 23:51:33.000000000 +0100 +@@ -18,5 +18,6 @@ + libfspotjpegtran_la_SOURCES = \ + $(libfspotjpegtran_files) + ++libfspotjpegtran_la_LIBADD = $(F_LIBS) + + EXTRA_DIST = README --- f-spot-0.5.0.3.orig/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.dpatch +++ f-spot-0.5.0.3/debian/patches/ubuntu_fix_export_crash_FlickrRemote.cs.dpatch @@ -0,0 +1,58 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu_fix_export_crash_FlickrRemote.cs.dpatch by > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: http://bugzilla.gnome.org/show_bug.cgi?id=553518 + +@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 { --- f-spot-0.5.0.3.orig/debian/patches/svn-r4545_locales-import.dpatch +++ f-spot-0.5.0.3/debian/patches/svn-r4545_locales-import.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## svn-r4545_locales-import.dpatch by Chris Coulson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch backported from SVN trunk revision 4545 +## DP: initialize the translation catalog earlier. Fix a nasty bug. +## DP: Launchpad bug: https://bugs.launchpad.net/ubuntu/+source/f-spot/+bug/293305 + +@DPATCH@ +diff -urNad f-spot-0.5.0.3~/src/main.cs f-spot-0.5.0.3/src/main.cs +--- f-spot-0.5.0.3~/src/main.cs 2008-10-18 11:54:25.000000000 +0100 ++++ f-spot-0.5.0.3/src/main.cs 2009-02-06 17:39:58.000000000 +0000 +@@ -72,7 +72,8 @@ + program = new Program (Defines.PACKAGE, + Defines.VERSION, + Modules.UI, args); +- ++ ++ Catalog.Init ("f-spot", Defines.LOCALE_DIR); + FSpot.Global.PhotoDirectory = Preferences.Get (Preferences.STORAGE_PATH); + + for (int i = 0; i < args.Length && !shutdown; i++) { +@@ -170,8 +171,6 @@ + } + + if (slideshow == true) { +- Catalog.Init ("f-spot", Defines.LOCALE_DIR); +- + Core core = new Core (); + core.ShowSlides (null); + program.Run (); +@@ -231,7 +230,6 @@ + Gtk.Rc.AddDefaultFile (Preferences.Get (Preferences.GTK_RC)); + } + +- Catalog.Init ("f-spot", Defines.LOCALE_DIR); + try { + Gtk.Window.DefaultIconList = new Gdk.Pixbuf [] { + GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 16, (Gtk.IconLookupFlags)0),