diff -u f-spot-0.4.1/debian/patches/00list f-spot-0.4.2/debian/patches/00list
--- f-spot-0.4.1/debian/patches/00list
+++ f-spot-0.4.2/debian/patches/00list
@@ -1,18 +1,12 @@
 11_screensaver-path
-20_refresh-menus-on-extensions
-25_delete-from-disk-throw-exception
-30_fix-infinite-loop
-35_validate-gallery-names
-40_flickr-export-crash
-45_about-dialog
-50-fix-missing-G_GNUC_FUNCTION
 55-add-mimetype
+galleryexport_rm
 fix_libfspot_linkage
 fix_libfspoteog_linkage
 fix_libfspotjpegtran_linkage
+disable_bundled_libs_build
 link_system_libs
 forward_port_to_flickrnet_2.1.5
-detect_and_upgrade_sqlite2_database
 no_dup_apps_icons
 unlink_nunit
 importer_targetdir_selector
reverted:
--- f-spot-0.4.1/debian/patches/45_about-dialog.dpatch
+++ f-spot-0.4.1.orig/debian/patches/45_about-dialog.dpatch
@@ -1,122 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 45_about-dialog.dpatch by Stephane Delcroix <sdelcroix@novell.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Migrate to Gtk.AboutDialog (upstream SVN 3568)
-
-@DPATCH@
-
---- trunk/src/MainWindow.cs 2008/01/18 07:47:13 3565
-+++ trunk/src/MainWindow.cs 2008/01/18 12:03:33 3568
-@@ -1593,7 +1593,7 @@
- 	private static About about = null;
- 	public static void HandleAbout (object sender, EventArgs args)
- 	{
--		string [] authors = new string [] {
-+/*		string [] authors = new string [] {
- 			"Ettore Perazzoli",
- 			"Lawrence Ewing",
- 			"Laurence Hygate",
-@@ -1644,6 +1644,8 @@
- 			   PixbufUtils.LoadFromAssembly ("f-spot-logo.svg"));
- 		about.Destroyed += delegate (object o, EventArgs e) {about = null;};
- 		about.Show ();
-+		*/
-+		FSpot.UI.Dialog.AboutDialog.ShowUp ();
- 	}
- 
- 	void HandleTagSizeChange (object sender, EventArgs args)
-@@ -3168,3 +3168,93 @@
- 		args.RetVal = false;
- 	}
- }
-+
-+namespace FSpot.UI.Dialog
-+{
-+	public class AboutDialog : Gtk.AboutDialog
-+	{
-+		private static AboutDialog about = null;
-+		
-+		private AboutDialog () {
-+			Artists = new string [] {
-+				"Jakub Steiner",	
-+			};
-+			Authors = new string [] {
-+				"Primary Development",
-+				"\tLawrence Ewing",
-+				"\tStephane Delcroix",
-+				"",
-+				"Active Contributors to this release",
-+				"\tLorenzo Milesi",
-+				"",
-+				"Contributors",
-+				"\tAaron Bockover",
-+				"\tAlessandro Gervaso",
-+				"\tAlex Graveley",
-+				"\tAlvaro del Castillo",
-+				"\tBen Monnahan",
-+				"\tBengt Thuree",
-+				"\tChad Files",
-+				"\tEttore Perazzoli",
-+				"\tEwen Cheslack-Postava",
-+				"\tJoe Shaw",
-+				"\tJoerg Buesse",
-+				"\tJon Trowbridge",
-+				"\tJoshua Tauberer",
-+				"\tGabriel Burt",
-+				"\tGrahm Orr",
-+				"\tLaurence Hygate",
-+				"\tLee Willis",
-+				"\tMartin Willemoes Hansen",
-+				"\tMatt Jones",
-+				"\tMiguel de Icaza",
-+				"\tNat Friedman",
-+				"\tPatanjali Somayaji",
-+				"\tPeter Johanson",
-+				"\tRuben Vermeersch",
-+				"\tTambet Ingo",
-+				"\tThomas Van Machelen",
-+				"\tTodd Berman",
-+				"\tVincent Moreau",
-+				"\tVladimir Vukicevic",
-+				"\tXavier Bouchoux",
-+				"",
-+				"In memory Of",
-+				"\tEttore Perazzoli",
-+			};
-+			Comments = "Photo management for GNOME";
-+			Copyright = Catalog.GetString ("Copyright \x00a9 2003-2008 Novell Inc.");
-+			Documenters = new string[] {
-+				"Aaron Bockover",
-+				"Alexandre Prokoudine",	
-+				"Bengt Thuree",
-+				"Gabriel Burt",
-+				"Miguel de Icaza",
-+				"Stephane Delcroix",
-+			};
-+			License = "GPL v2";
-+			Logo = PixbufUtils.LoadFromAssembly ("f-spot-logo.svg");
-+	#if !GTK_2_11
-+			Name = "F-Spot";
-+	#endif
-+			TranslatorCredits = Catalog.GetString ("translator-credits");
-+                	if (System.String.Compare (TranslatorCredits, "translator-credits") == 0)
-+                		TranslatorCredits = null;
-+			Version = Defines.VERSION;
-+			Website = "http://f-spot.org";
-+			WebsiteLabel = Catalog.GetString ("F-Spot Website");
-+			WrapLicense = true;
-+		}
-+
-+		public static AboutDialog ShowUp ()
-+		{
-+			if (about == null)
-+				about = new AboutDialog ();
-+			about.Destroyed += delegate (object o, EventArgs e) {about = null;};
-+			about.Response += delegate (object o, Gtk.ResponseArgs e) {if (about != null) about.Destroy ();};
-+			about.Show ();
-+			return about;
-+		}
-+	}
-+}
-+
reverted:
--- f-spot-0.4.1/debian/patches/25_delete-from-disk-throw-exception.dpatch
+++ f-spot-0.4.1.orig/debian/patches/25_delete-from-disk-throw-exception.dpatch
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_delete-from-disk-throw-exception.dpatch by Lorenzo Milesi <maxxer@yetopen.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Throw an exception if Gnome.Vfs.Unlink fails ('Delete from disk')
-## DP: so the user is informed if a failure occurred (upstream SVN 3472) 
-
-@DPATCH@
-
---- trunk/src/PhotoStore.cs	2007/12/04 20:39:52	3467
-+++ trunk/src/PhotoStore.cs	2007/12/05 11:08:58	3472
-@@ -371,8 +371,10 @@
- 		System.Uri uri =  VersionUri (version_id);
- 
- 		if (!keep_file) {
--			if ((new Gnome.Vfs.Uri (uri.ToString ())).Exists)
--				(new Gnome.Vfs.Uri (uri.ToString ())).Unlink ();	
-+			if ((new Gnome.Vfs.Uri (uri.ToString ())).Exists) {
-+				if ((new Gnome.Vfs.Uri (uri.ToString ()).Unlink()) != Result.Ok)
-+					throw new System.UnauthorizedAccessException();
-+			}
- 
- 			try {
- 				string thumb_path = ThumbnailGenerator.ThumbnailPath (uri);
reverted:
--- f-spot-0.4.1/debian/patches/detect_and_upgrade_sqlite2_database.dpatch
+++ f-spot-0.4.1.orig/debian/patches/detect_and_upgrade_sqlite2_database.dpatch
@@ -1,151 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## detect_sqlite2_databases.dpatch by Mirco Bauer <meebey@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad f-spot-0.4.1~/src/Db.cs f-spot-0.4.1/src/Db.cs
---- f-spot-0.4.1~/src/Db.cs	2008-01-02 19:47:36.000000000 +0100
-+++ f-spot-0.4.1/src/Db.cs	2008-01-02 19:49:36.000000000 +0100
-@@ -1,10 +1,10 @@
- using System.Threading;
- using System.Collections;
-+using System.Diagnostics;
- using System.IO;
- using System;
- using Banshee.Database;
- 
--
- // All kinds of database items subclass from this.
- public class DbItem {
- 	uint id;
-@@ -43,6 +43,12 @@
- public delegate void ItemsRemovedHandler (object sender, DbItemEventArgs args);
- public delegate void ItemsChangedHandler (object sender, DbItemEventArgs args);
- 
-+public class DbException : ApplicationException {
-+	public DbException(string msg) : base(msg)
-+	{
-+	}
-+}
-+
- public abstract class DbStore {
- 	// DbItem cache.
- 
-@@ -235,7 +241,40 @@
- 		if (new_db && ! create_if_missing)
- 			throw new Exception (path + ": File not found");
- 
--		database = new QueuedSqliteDatabase(path);	
-+		database = new QueuedSqliteDatabase(path);
-+		if (database.GetFileVersion(path) == 2) {
-+			// close the old database first
-+			database.Dispose();
-+
-+			string error = null;
-+			if (!File.Exists("/usr/bin/sqlite")) {
-+				error = "The required program /usr/bin/sqlite is missing on this system, please install sqlite.";
-+			}
-+			if (!File.Exists("/usr/bin/sqlite3")) {
-+				error = "The required program /usr/bin/sqlite3 is missing on this system, please install sqlite3.";
-+			}
-+
-+			if (error == null) {
-+				Console.WriteLine("Running f-spot-sqlite-upgrade script...");
-+				ProcessStartInfo updaterInfo = new ProcessStartInfo("/usr/bin/f-spot-sqlite-upgrade");
-+				updaterInfo.UseShellExecute = false;
-+				updaterInfo.RedirectStandardError = true;
-+				Process updater = Process.Start(updaterInfo);
-+				string stdError = updater.StandardError.ReadToEnd();
-+				updater.WaitForExit();
-+				if (updater.ExitCode != 0) {
-+					error = "/usr/bin/f-spot-sqlite-upgrade returned:\n" + stdError;
-+				}
-+			}
-+			
-+			if (error != null) {
-+				string msg = "Failed to upgrade the f-spot sqlite2 database to sqlite3!\n" + error;
-+				throw new DbException(msg);
-+ 			}
-+
-+			// reopen the new converted database
-+			database = new QueuedSqliteDatabase(path);
-+		}
- 
- 		// Load or create the meta table
-  		meta_store = new MetaStore (Database, new_db);
-diff -urNad f-spot-0.4.1~/src/QueuedSqliteDatabase.cs f-spot-0.4.1/src/QueuedSqliteDatabase.cs
---- f-spot-0.4.1~/src/QueuedSqliteDatabase.cs	2008-01-02 19:47:36.000000000 +0100
-+++ f-spot-0.4.1/src/QueuedSqliteDatabase.cs	2008-01-02 19:48:58.000000000 +0100
-@@ -266,7 +266,7 @@
-             connection.Close();
-         }
- 
--        private int GetFileVersion(string path) 
-+        public int GetFileVersion(string path) 
-         {
-             if (!File.Exists(path)) {
-                 return 3;
-diff -urNad f-spot-0.4.1~/src/main.cs f-spot-0.4.1/src/main.cs
---- f-spot-0.4.1~/src/main.cs	2008-01-02 19:47:36.000000000 +0100
-+++ f-spot-0.4.1/src/main.cs	2008-01-02 19:48:58.000000000 +0100
-@@ -176,6 +176,11 @@
- 
- 					if (core != null)
- 						core.UnregisterServer ();
-+
-+					// if there is a problem with the DB, so is no way we can survive
-+					if (e is DbException) {
-+						throw;
-+					}
- 				}
- 				if (control == null)
- 					System.Console.WriteLine ("Can't get a connection to the dbus. Trying again...");
-diff -urNad f-spot-0.4.1~/tools/f-spot-sqlite-upgrade f-spot-0.4.1/tools/f-spot-sqlite-upgrade
---- f-spot-0.4.1~/tools/f-spot-sqlite-upgrade	2008-01-02 19:47:36.000000000 +0100
-+++ f-spot-0.4.1/tools/f-spot-sqlite-upgrade	2008-01-02 19:48:58.000000000 +0100
-@@ -1,8 +1,12 @@
- #!/bin/sh
-+set -e
-+
- # This only upgrades the default database location
- # if you have specified a different location 
- DB_LOCATION=~/.gnome2/f-spot/photos.db
- BACKUP_LOCATION=$DB_LOCATION.backup
-+DUMP_LOCATION=$DB_LOCATION.dump
-+NEW_DB_LOCATION=$DB_LOCATION.new
- 
- if ! which sqlite >& /dev/null ; then
- 	echo "Could not find sqlite binary. Update aborted."
-@@ -12,10 +16,28 @@
- 	exit 1
- fi
- 
-+if [ ! -f $DB_LOCATION ]; then
-+	echo "Could not find $DB_LOCATION, nothing to update. Update aborted."
-+	exit 1
-+fi
-+
-+# make sure nothing gets in the way
-+rm -f $BACKUP_LOCATION
-+rm -f $DUMP_LOCATION
-+rm -f $NEW_DB_LOCATION
-+
- if grep "^...This file contains an SQLite 2.1 database" $DB_LOCATION &> /dev/null; then
- 	echo "Upgrading from SQLite 2.1 to SQLite3"
--	mv $DB_LOCATION $BACKUP_LOCATION
--	sqlite $BACKUP_LOCATION .dump | sqlite3 $DB_LOCATION
-+	cp $DB_LOCATION $BACKUP_LOCATION
-+	if sqlite $DB_LOCATION .dump > $DUMP_LOCATION &&
-+	   sqlite3 $NEW_DB_LOCATION < $DUMP_LOCATION; then
-+		cp $NEW_DB_LOCATION $DB_LOCATION
-+		echo "Upgrade was successful."
-+	else
-+		echo "Upgrade failed, putting old database back."
-+		cp $BACKUP_LOCATION $DB_LOCATION
-+		exit 1
-+	fi
- else
- 	echo "Database is already upgraded"
- fi
reverted:
--- f-spot-0.4.1/debian/patches/50-fix-missing-G_GNUC_FUNCTION.dpatch
+++ f-spot-0.4.1.orig/debian/patches/50-fix-missing-G_GNUC_FUNCTION.dpatch
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix compile error due to deprecated G_GNUC_FUNCTION
-
-@DPATCH@
-
-diff -Nur -x '*.orig' -x '*~' f-spot-0.4.1/libfspot/f-jpeg-utils.c f-spot-0.4.1.new/libfspot/f-jpeg-utils.c
---- f-spot-0.4.1/libfspot/f-jpeg-utils.c	2007-12-04 13:19:22.000000000 +0100
-+++ f-spot-0.4.1.new/libfspot/f-jpeg-utils.c	2008-02-14 09:55:00.000000000 +0100
-@@ -463,7 +463,7 @@
- 		jpegtran_transform = JXFORM_FLIP_V;
- 		break;
- 	default:
--		g_warning (G_GNUC_FUNCTION ": unknown transform type %d", transform);
-+		g_warning (G_STRLOC ": unknown transform type %d", transform);
- 		if (error_message_return != NULL)
- 			*error_message_return = g_strdup_printf (_("Unknown transform type %d"), transform);
- 		return FALSE;
reverted:
--- f-spot-0.4.1/debian/patches/30_fix-infinite-loop.dpatch
+++ f-spot-0.4.1.orig/debian/patches/30_fix-infinite-loop.dpatch
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix-infinite-loop.dpatch by Lorenzo Milesi <maxxer@yetopen.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix F-spot getting stuck in a loop if there's an exception on start 
-## DP: (upstream SVN 3484)
-
-@DPATCH@
-
---- trunk/src/main.cs	2007/12/04 20:39:52	3467
-+++ trunk/src/main.cs	2007/12/08 08:29:01	3484
-@@ -130,6 +130,7 @@
- 			setupService.Repositories.RegisterRepository (null, "http://addins.f-spot.org", false);
- 
- 			bool create = true;
-+			int retry_count = 0;
- 			while (control == null) {
- 				try {
- 					control = Core.FindInstance ();
-@@ -170,8 +171,13 @@
- 					if (core != null)
- 						core.UnregisterServer ();
- 				}
--				if (control == null)
-+				if (control == null) {
- 					System.Console.WriteLine ("Can't get a connection to the dbus. Trying again...");
-+					if (++ retry_count > 5) {
-+						System.Console.WriteLine ("Sorry, couldn't start F-Spot");
-+						System.Environment.Exit (1);
-+					}
-+				}
- 			}
- 			
- 			
reverted:
--- f-spot-0.4.1/debian/patches/01_build-system.dpatch
+++ f-spot-0.4.1.orig/debian/patches/01_build-system.dpatch
@@ -1,133 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build-system.dpatch by  <tim@retout.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes to f-spot build system from Debian package version 0.3.5-1.2
-
-@DPATCH@
-
-commit 262c969b3e1fa0f4085c9e447752dfa10180bfb8
-Author: Tim Retout <tim@retout.co.uk>
-Date:   Sat Dec 8 20:40:37 2007 +0000
-
-    Imported Debian patch 0.3.5-1.2
-
-diff --git a/Makefile.am b/Makefile.am
-index 2e8c1ca..8dca427 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,11 @@
-+if !EXTERNAL_DBUS
-+DBUS_DIRS =             \
-+	dbus-sharp      \
-+	dbus-sharp-glib 
-+endif
-+
- SUBDIRS = 		\
--	dbus-sharp	\
--	dbus-sharp-glib	\
-+	$(DBUS_DIRS)    \
- 	docs		\
- 	FlickrNet	\
- 	SmugMugNet	\
-diff --git a/libeog/Makefile.am b/libeog/Makefile.am
-index 4152d1f..aed4a98 100644
---- a/libeog/Makefile.am
-+++ b/libeog/Makefile.am
-@@ -44,6 +44,7 @@ libfspoteog_files =				\
- 
- libfspoteog_la_SOURCES = $(libfspoteog_files)
- 
-+libfspoteog_la_LIBADD = $(F_LIBS) $(LCMS_LIBS)
- 
- # GLib marshalling cruft
- 
-diff --git a/libfspot/Makefile.am b/libfspot/Makefile.am
-index d37c522..df39e01 100644
---- a/libfspot/Makefile.am
-+++ b/libfspot/Makefile.am
-@@ -30,7 +30,8 @@ libfspot_la_SOURCES =				\
- 	f-utils.h
- 
- libfspot_la_LIBADD = 					\
--	$(LCMS_LIBS)					\
-+	$(F_LIBS) \
-+	$(LCMS_LIBS) \
- 	$(EXIF_LIBS)					\
- 	$(top_builddir)/libjpegtran/libfspotjpegtran.la	\
- 	$(top_builddir)/libeog/libfspoteog.la
-diff --git a/libjpegtran/Makefile.am b/libjpegtran/Makefile.am
-index 96465d0..b2f0d1a 100644
---- a/libjpegtran/Makefile.am
-+++ b/libjpegtran/Makefile.am
-@@ -18,5 +18,6 @@ libfspotjpegtran_files =			\
- libfspotjpegtran_la_SOURCES =			\
- 	$(libfspotjpegtran_files)
- 
-+libfspotjpegtran_la_LIBADD = $(LIBJPEG) $(F_LIBS)
- 
- EXTRA_DIST = README
-commit 262c969b3e1fa0f4085c9e447752dfa10180bfb8
-Author: Tim Retout <tim@retout.co.uk>
-Date:   Sat Dec 8 20:40:37 2007 +0000
-
-    Imported Debian patch 0.3.5-1.2
-
-diff --git a/configure.in b/configure.in
-index f6915f7..2efcd00 100644
---- a/configure.in
-+++ b/configure.in
-@@ -104,6 +104,16 @@ dnl --- GConf
- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
- AM_GCONF_SOURCE_2
- 
-+dnl --- NDesk.DBus
-+
-+PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 \
-+	ndesk-dbus-glib-1.0 >= 0.3, have_external_dbus="yes", have_external_dbus="no")
-+if test "x$have_external_dbus" != "xyes"; then
-+	AC_MSG_RESULT([using internal copy])
-+fi
-+AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes")
-+AC_SUBST(DBUS_LIBS)
-+
- 
- dnl --- libjpeg
- 
-@@ -163,6 +173,11 @@ fi
- 
- GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/gnome-screensaver/themes
- 
-+if pkg-config --exists gnome-screensaver ; then
-+  GNOME_SCREENSAVER_SAVERDIR=$(pkg-config --variable=privlibexecdir gnome-screensaver)
-+  GNOME_SCREENSAVER_THEMESDIR=$(pkg-config --variable=themesdir gnome-screensaver)
-+fi
-+
- AC_SUBST(GNOME_SCREENSAVER_SAVERDIR)
- AC_SUBST(GNOME_SCREENSAVER_THEMESDIR)
- 
-commit 262c969b3e1fa0f4085c9e447752dfa10180bfb8
-Author: Tim Retout <tim@retout.co.uk>
-Date:   Sat Dec 8 20:40:37 2007 +0000
-
-    Imported Debian patch 0.3.5-1.2
-
-diff --git a/Makefile.include b/Makefile.include
-index 815cc9f..987e14d 100644
---- a/Makefile.include
-+++ b/Makefile.include
-@@ -24,9 +24,13 @@ DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
- ## Links
- 
-+if EXTERNAL_DBUS
-+LINK_DBUS = $(DBUS_LIBS)
-+else
- LINK_DBUS = 					\
- 	-r:$(DIR_DBUS)/NDesk.DBus.dll		\
--	-r:$(DIR_DBUS_GLIB)/NDesk.DBus.GLib.dll
-+	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-+endif
- LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
- LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
reverted:
--- f-spot-0.4.1/debian/patches/20_refresh-menus-on-extensions.dpatch
+++ f-spot-0.4.1.orig/debian/patches/20_refresh-menus-on-extensions.dpatch
@@ -1,97 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_refresh-menus-on-extensions.dpatch by Stephane Delcroix <sdelcroix@novell.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Refresh the Export and Tools menus on new or removed extensions (upstream SVN 3478)
-
-@DPATCH@
-
---- trunk/src/MainWindow.cs	2007/12/05 11:08:58	3472
-+++ trunk/src/MainWindow.cs	2007/12/07 12:37:10	3478
-@@ -433,24 +433,8 @@
- 		this.selection.Changed += HandleSelectionChanged;
- 		this.selection.ItemsChanged += HandleSelectionItemsChanged;
- 
--		try {
--			if (export.Submenu != null)
--				export.RemoveSubmenu ();
--
--			export.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Exports") as FSpot.Extensions.SubmenuNode).GetMenuItem ().Submenu;
--		} catch {
--			Console.WriteLine ("There's (maybe) something wrong with some of the installed extensions. You can try removing the directory addin-db-000 from ~/.gnome2/f-spot/");
--		}
--
--		try {
--			if (tools.Submenu != null)
--				tools.RemoveSubmenu ();
--
--			tools.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Tools") as FSpot.Extensions.SubmenuNode).GetMenuItem ().Submenu;
--		} catch {
--			Console.WriteLine ("There's (maybe) something wrong with some of the installed extensions. You can try removing the directory addin-db-000 from ~/.gnome2/f-spot/");
--			tools.Visible = false;
--		}
-+		Mono.Addins.AddinManager.ExtensionChanged += PopulateExtendableMenus;
-+		PopulateExtendableMenus (null, null);
- 
- 		UpdateMenus ();
- 
-@@ -2918,6 +2902,27 @@
-         //}
- 	}
- 
-+	void PopulateExtendableMenus (object o, EventArgs args)
-+	{
-+		try {
-+			if (export.Submenu != null)
-+				export.Submenu.Dispose ();
-+			if (tools.Submenu != null)
-+				tools.RemoveSubmenu ();
-+
-+			export.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Exports") as FSpot.Extensions.SubmenuNode).GetSubmenu ();
-+			export.Submenu.ShowAll ();
-+
-+			tools.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Tools") as FSpot.Extensions.SubmenuNode).GetSubmenu ();
-+			tools.Submenu.ShowAll ();
-+
-+			tools.Visible = (tools.Submenu as Menu).Children.Length > 0;
-+		} catch {
-+			Console.WriteLine ("There's (maybe) something wrong with some of the installed extensions. You can try removing the directory addin-db-000 from ~/.gnome2/f-spot/");
-+			tools.Visible = false;
-+		}
-+	}
-+
- 	public void HandleOpenWith (object sender, Gnome.Vfs.MimeApplication mime_application)
- 	{
- 		Photo[] selected = SelectedPhotos ();
-
---- trunk/src/Extensions/MenuNode.cs	2007/07/26 08:03:48	3250
-+++ trunk/src/Extensions/MenuNode.cs	2007/12/07 12:37:10	3478
-@@ -25,15 +25,25 @@
- 	{
- 		public override Gtk.MenuItem GetMenuItem ()
- 		{
--			Gtk.MenuItem item = base.GetMenuItem ();;
-+			Gtk.MenuItem item = base.GetMenuItem ();
-+
-+			Gtk.Menu submenu = GetSubmenu ();
- 
-+			if (item.Submenu != null)
-+				item.Submenu.Dispose ();	
-+			
-+			item.Submenu = submenu;
-+			return item;
-+		}
-+
-+		public Gtk.Menu GetSubmenu ()
-+		{
- 			Gtk.Menu submenu = new Gtk.Menu ();
- 
- 			foreach (MenuNode node in ChildNodes)
- 				submenu.Insert (node.GetMenuItem (), -1);
- 
--			item.Submenu = submenu;
--			return item;
-+			return submenu;				
- 		}
- 	}
- 
diff -u f-spot-0.4.1/debian/patches/unlink_nunit.dpatch f-spot-0.4.2/debian/patches/unlink_nunit.dpatch
--- f-spot-0.4.1/debian/patches/unlink_nunit.dpatch
+++ f-spot-0.4.2/debian/patches/unlink_nunit.dpatch
@@ -8,38 +8,54 @@
-diff -urNad f-spot-0.4.1~/src/Makefile.am f-spot-0.4.1/src/Makefile.am
---- f-spot-0.4.1~/src/Makefile.am	2007-12-04 13:19:18.000000000 +0100
-+++ f-spot-0.4.1/src/Makefile.am	2008-01-01 17:38:29.000000000 +0100
+diff -urN f-spot-0.4.2~/src/Makefile.am f-spot-0.4.2/src/Makefile.am
+--- f-spot-0.4.2~/src/Makefile.am	2008-02-15 04:26:50.000000000 +0600
++++ f-spot-0.4.2/src/Makefile.am	2008-02-15 11:38:02.000000000 +0600
 @@ -1,5 +1,5 @@
  include $(top_srcdir)/Makefile.include
 -EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
 +EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
  
- F_SPOT_CSDISTFILES =				\
- 	$(srcdir)/Cairo/Antialias.cs		\
-@@ -254,7 +254,6 @@
- 	-r:Mono.Posix				\
- 	-r:Mono.Security			\
- 	-r:ICSharpCode.SharpZipLib		\
+ CMS_CSDISTFILES =				\
+ 	$(srcdir)/Cms/Cms.cs			\
+@@ -270,7 +270,6 @@
+ endif
+ 
+ CMS_ASSEMBLIES = 				\
+-	$(NUNIT_PKG)				\
+ 	-pkg:gtk-sharp-2.0
+ 
+ CORE_ASSEMBLIES =				\
+@@ -312,7 +311,6 @@
+ 	-r:FSpot.Query.dll			\
+ 	-r:FSpot.Utils.dll			\
+ 	-r:Cms.dll				\
 -	$(NUNIT_PKG)				\
- 	-pkg:gtkhtml-sharp-2.0			\
+ 	$(GCONF_PKG)				\
+ 	$(GTKHTML_SHARP_PKG)			\
  	-pkg:glade-sharp-2.0			\
- 	-pkg:gnome-vfs-sharp-2.0		\
-diff -urNad f-spot-0.4.1~/src/Makefile.in f-spot-0.4.1/src/Makefile.in
---- f-spot-0.4.1~/src/Makefile.in	2008-01-01 16:29:16.000000000 +0100
-+++ f-spot-0.4.1/src/Makefile.in	2008-01-01 17:38:54.000000000 +0100
-@@ -307,7 +307,7 @@
- CSC_LIB = $(CSC) -target:library
+diff -urN f-spot-0.4.2~/src/Makefile.in f-spot-0.4.2/src/Makefile.in
+--- f-spot-0.4.2~/src/Makefile.in	2008-02-15 04:27:21.000000000 +0600
++++ f-spot-0.4.2/src/Makefile.in	2008-02-15 11:39:04.000000000 +0600
+@@ -306,7 +306,7 @@
+ CSC_LIB = gmcs $(CSC_FLAGS) -target:library
  MONO_DEBUGFLAGS = --debug
  RUNTIME = mono $(MONO_DEBUGFLAGS)
 -EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
 +EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
- F_SPOT_CSDISTFILES = \
- 	$(srcdir)/Cairo/Antialias.cs		\
- 	$(srcdir)/Cairo/Cairo.cs		\
-@@ -561,7 +561,6 @@
- 	-r:Mono.Posix				\
- 	-r:Mono.Security			\
- 	-r:ICSharpCode.SharpZipLib		\
+ CMS_CSDISTFILES = \
+ 	$(srcdir)/Cms/Cms.cs			\
+ 	$(srcdir)/Cms/CctTable.cs
+@@ -573,7 +573,6 @@
+ 
+ @NOGCONF_FALSE@GCONF_PKG = -pkg:gconf-sharp-2.0
+ CMS_ASSEMBLIES = \
+-	$(NUNIT_PKG)				\
+ 	-pkg:gtk-sharp-2.0
+ 
+ CORE_ASSEMBLIES = \
+@@ -615,7 +614,6 @@
+ 	-r:FSpot.Query.dll			\
+ 	-r:FSpot.Utils.dll			\
+ 	-r:Cms.dll				\
 -	$(NUNIT_PKG)				\
- 	-pkg:gtkhtml-sharp-2.0			\
+ 	$(GCONF_PKG)				\
+ 	$(GTKHTML_SHARP_PKG)			\
  	-pkg:glade-sharp-2.0			\
- 	-pkg:gnome-vfs-sharp-2.0		\
reverted:
--- f-spot-0.4.1/debian/patches/40_flickr-export-crash.dpatch
+++ f-spot-0.4.1.orig/debian/patches/40_flickr-export-crash.dpatch
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_flickr-export-crash.dpatch by Lorenzo Milesi <maxxer@yetopen.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix crash when exporting to Flickr in --view mode (upstream SVN 3493)
-
-@DPATCH@
-
---- trunk/src/FlickrExport.cs	2007/12/07 15:37:58	3481
-+++ trunk/src/FlickrExport.cs	2007/12/10 13:49:53	3493
-@@ -11,7 +11,7 @@
- 	{
- 		public override void Run (IBrowsableCollection selection)
- 		{
--			Run (SupportedService.TwentyThreeHQ, selection, true);
-+			Run (SupportedService.TwentyThreeHQ, selection, false);
- 		}
- 	}
- 
-@@ -115,7 +115,7 @@
- 
- 		public virtual void Run (IBrowsableCollection selection)
- 		{
--			Run (SupportedService.Flickr, selection, true);
-+			Run (SupportedService.Flickr, selection, false);
- 		}
- 
- 		public void Run (SupportedService service, IBrowsableCollection selection, bool display_tags)
diff -u f-spot-0.4.1/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch f-spot-0.4.2/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
--- f-spot-0.4.1/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
+++ f-spot-0.4.2/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
@@ -5,9 +5,8 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad f-spot-0.4.1~/src/FlickrExport.cs f-spot-0.4.1/src/FlickrExport.cs
---- f-spot-0.4.1~/src/FlickrExport.cs	2007-12-04 13:19:18.000000000 +0100
-+++ f-spot-0.4.1/src/FlickrExport.cs	2007-12-11 22:31:49.000000000 +0100
+--- f-spot-0.4.2/extensions/FlickrExport/FlickrExport.cs	2007-12-04 13:19:18.000000000 +0100
++++ f-spot-0.4.2/extensions/FlickrExport/FlickrExport.cs	2007-12-11 22:31:49.000000000 +0100
 @@ -231,7 +231,7 @@
  				fr = new FlickrRemote (token, current_service);
  				fr.TryWebLogin();
@@ -17,9 +16,8 @@
  				if (e.Code == 98) {
  					Logout ();
  					Login ();
-diff -urNad f-spot-0.4.1~/src/FlickrRemote.cs f-spot-0.4.1/src/FlickrRemote.cs
---- f-spot-0.4.1~/src/FlickrRemote.cs	2007-12-04 13:19:18.000000000 +0100
-+++ f-spot-0.4.1/src/FlickrRemote.cs	2007-12-11 22:32:56.000000000 +0100
+--- f-spot-0.4.2/extensions/FlickrExport/FlickrRemote.cs	2007-12-04 13:19:18.000000000 +0100
++++ f-spot-0.4.2/extensions/FlickrExport/FlickrRemote.cs	2007-12-11 22:32:56.000000000 +0100
 @@ -58,7 +58,7 @@
  		if (licenses == null) {
  			try {
reverted:
--- f-spot-0.4.1/debian/patches/10_cs-changes.dpatch
+++ f-spot-0.4.1.orig/debian/patches/10_cs-changes.dpatch
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## cs-changes.dpatch by  <tim@retout.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Miscellaneous f-spot changes from Debian package version 0.3.5-1.2
-
-@DPATCH@
-
-commit 262c969b3e1fa0f4085c9e447752dfa10180bfb8
-Author: Tim Retout <tim@retout.co.uk>
-Date:   Sat Dec 8 20:40:37 2007 +0000
-
-    Imported Debian patch 0.3.5-1.2
-
-diff --git a/google-sharp/PicasaWeb.cs b/google-sharp/PicasaWeb.cs
-index aac6fc8..d808d9d 100644
---- a/google-sharp/PicasaWeb.cs
-+++ b/google-sharp/PicasaWeb.cs
-@@ -260,7 +260,8 @@ namespace Mono.Google.Picasa {
- 			XmlNamespaceManager nsmgr = new XmlNamespaceManager (doc.NameTable);
- 			nsmgr.AddNamespace ("photo", "http://www.pheed.com/pheed/");
- 			nsmgr.AddNamespace ("media", "http://search.yahoo.com/mrss/");
--			nsmgr.AddNamespace ("gphoto", "http://picasaweb.google.com/lh/picasaweb");
-+			nsmgr.AddNamespace ("gphoto", "http://schemas.google.com/photos/2007");
-+			nsmgr.AddNamespace ("batch", "http://schemas.google.com/gdata/batch");
- 			node = channel.SelectSingleNode ("gphoto:user", nsmgr);
- 			user = node.InnerText;
- 			node = channel.SelectSingleNode ("gphoto:nickname", nsmgr);
-diff --git a/src/Db.cs b/src/Db.cs
-index 5f6ed8c..dd8c52f 100644
---- a/src/Db.cs
-+++ b/src/Db.cs
-@@ -363,7 +363,9 @@ public class Db : IDisposable {
- 
- 			if (version == 2)
- 				version_string += ",encoding=UTF-8";
--		}
-+		} else {
-+		  version_string = ",version=3";
-+    }
- 		
- 		sqlite_connection = new SqliteConnection ();
- 		sqlite_connection.ConnectionString = "URI=file:" + path + version_string;
-diff --git a/src/Imaging/ImageFile.cs b/src/Imaging/ImageFile.cs
-index 74cf22c..918891f 100644
---- a/src/Imaging/ImageFile.cs
-+++ b/src/Imaging/ImageFile.cs
-@@ -53,6 +53,7 @@ namespace FSpot {
- 			name_table [".nef"] = typeof (FSpot.Tiff.NefFile);
- 			name_table [".pef"] = typeof (FSpot.Tiff.NefFile);
- 			name_table [".raw"] = typeof (FSpot.Tiff.NefFile);
-+			name_table [".kdc"] = typeof (FSpot.Tiff.NefFile);
- 			name_table [".tiff"] = typeof (FSpot.Tiff.TiffFile);
- 			name_table [".tif"] = typeof (FSpot.Tiff.TiffFile);
- 			name_table [".orf"] =  typeof (FSpot.Tiff.NefFile);
reverted:
--- f-spot-0.4.1/debian/patches/35_validate-gallery-names.dpatch
+++ f-spot-0.4.1.orig/debian/patches/35_validate-gallery-names.dpatch
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 35_validate-gallery-names.dpatch by Lorenzo Milesi <maxxer@yetopen.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix F-Spot creating galleries with invalid names (upstream SVN 3491)
-
-@DPATCH@
-
---- trunk/src/GalleryExport.cs	2007/12/07 15:37:58	3481
-+++ trunk/src/GalleryExport.cs	2007/12/10 12:30:31	3491
-@@ -535,6 +535,18 @@
- 		protected void HandleAddResponse (object sender, Gtk.ResponseArgs args)
- 		{
- 			if (args.ResponseId == Gtk.ResponseType.Ok) {
-+				if (!System.Text.RegularExpressions.Regex.IsMatch (name, "^[A-Za-z0-9_-]+$")) {
-+					HigMessageDialog md = 
-+						new HigMessageDialog (Dialog, 
-+								      Gtk.DialogFlags.Modal |
-+								      Gtk.DialogFlags.DestroyWithParent,
-+								      Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
-+								      Catalog.GetString ("Invalid Gallery name"),
-+								      Catalog.GetString ("The gallery name contains invalid characters.\nOnly letters, numbers, - and _ are allowed"));
-+					md.Run ();
-+					md.Destroy ();
-+					return;
-+				}
- 				gallery.NewAlbum (parent, name, title, description);
- 				export.HandleAlbumAdded (title);
- 			}
diff -u f-spot-0.4.1/debian/patches/link_system_libs.dpatch f-spot-0.4.2/debian/patches/link_system_libs.dpatch
--- f-spot-0.4.1/debian/patches/link_system_libs.dpatch
+++ f-spot-0.4.2/debian/patches/link_system_libs.dpatch
@@ -5,18 +5,11 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad f-spot-0.4.1~/FlickrNet/Makefile.in f-spot-0.4.1/FlickrNet/Makefile.in
---- f-spot-0.4.1~/FlickrNet/Makefile.in	2007-12-04 13:20:31.000000000 +0100
-+++ f-spot-0.4.1/FlickrNet/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
- LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
+diff -urN f-spot-0.4.2~/dbus-sharp/Makefile.in f-spot-0.4.2/dbus-sharp/Makefile.in
+--- f-spot-0.4.2~/dbus-sharp/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/dbus-sharp/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
+ 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		\
@@ -27,112 +20,28 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/Makefile.am f-spot-0.4.1/Makefile.am
---- f-spot-0.4.1~/Makefile.am	2007-12-04 13:19:26.000000000 +0100
-+++ f-spot-0.4.1/Makefile.am	2007-12-11 21:26:25.000000000 +0100
-@@ -2,7 +2,6 @@
- 	$(DIR_DBUS)	\
- 	$(DIR_DBUS_GLIB)\
- 	docs		\
--	FlickrNet	\
- 	SmugMugNet	\
- 	glitz-sharp	\
- 	google-sharp	\
-@@ -14,7 +13,6 @@
- 	libgphoto2-sharp \
- 	semweb		\
- 	Tao		\
--	mono-addins	\
- 	tools		\
- 	po		\
- 	src		\
-@@ -24,7 +22,6 @@
- 	dbus-sharp	\
- 	dbus-sharp-glib	\
- 	docs		\
--	FlickrNet	\
- 	SmugMugNet	\
- 	glitz-sharp	\
- 	google-sharp	\
-@@ -36,7 +33,6 @@
- 	libgphoto2-sharp \
- 	semweb		\
- 	Tao		\
--	mono-addins	\
- 	tools		\
- 	po		\
- 	src		\
-diff -urNad f-spot-0.4.1~/Makefile.in f-spot-0.4.1/Makefile.in
---- f-spot-0.4.1~/Makefile.in	2007-12-04 13:20:34.000000000 +0100
-+++ f-spot-0.4.1/Makefile.in	2007-12-11 21:26:33.000000000 +0100
-@@ -294,7 +294,6 @@
- 	$(DIR_DBUS)	\
- 	$(DIR_DBUS_GLIB)\
- 	docs		\
--	FlickrNet	\
- 	SmugMugNet	\
- 	glitz-sharp	\
- 	google-sharp	\
-@@ -306,7 +305,6 @@
- 	libgphoto2-sharp \
- 	semweb		\
- 	Tao		\
--	mono-addins	\
- 	tools		\
- 	po		\
- 	src		\
-@@ -316,7 +314,6 @@
- 	dbus-sharp	\
- 	dbus-sharp-glib	\
- 	docs		\
--	FlickrNet	\
- 	SmugMugNet	\
- 	glitz-sharp	\
- 	google-sharp	\
-@@ -328,7 +325,6 @@
- 	libgphoto2-sharp \
- 	semweb		\
- 	Tao		\
--	mono-addins	\
- 	tools		\
- 	po		\
- 	src		\
-diff -urNad f-spot-0.4.1~/Makefile.include f-spot-0.4.1/Makefile.include
---- f-spot-0.4.1~/Makefile.include	2007-12-04 13:19:26.000000000 +0100
-+++ f-spot-0.4.1/Makefile.include	2007-12-11 21:25:38.000000000 +0100
-@@ -27,15 +27,15 @@
- 
- ## Links
- 
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/dbus-sharp-glib/Makefile.in f-spot-0.4.2/dbus-sharp-glib/Makefile.in
+--- f-spot-0.4.2~/dbus-sharp-glib/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/dbus-sharp-glib/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
- LINK_MONO_ADDINS =					\
+ 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
 +	$(shell pkg-config --libs mono-addins)		\
 +	$(shell pkg-config --libs mono-addins-setup)	\
 +	$(shell pkg-config --libs mono-addins-gui)
+ 
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
- LINK_TAO = 								\
-diff -urNad f-spot-0.4.1~/SmugMugNet/Makefile.in f-spot-0.4.1/SmugMugNet/Makefile.in
---- f-spot-0.4.1~/SmugMugNet/Makefile.in	2007-12-04 13:20:31.000000000 +0100
-+++ f-spot-0.4.1/SmugMugNet/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/CDExport/Makefile.in f-spot-0.4.2/extensions/CDExport/Makefile.in
+--- f-spot-0.4.2~/extensions/CDExport/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/extensions/CDExport/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -143,19 +52,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/Tao/Tao.GlPostProcess/Makefile.in f-spot-0.4.1/Tao/Tao.GlPostProcess/Makefile.in
---- f-spot-0.4.1~/Tao/Tao.GlPostProcess/Makefile.in	2007-12-04 13:20:31.000000000 +0100
-+++ f-spot-0.4.1/Tao/Tao.GlPostProcess/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -270,15 +270,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/DefaultExporters/Makefile.in f-spot-0.4.2/extensions/DefaultExporters/Makefile.in
+--- f-spot-0.4.2~/extensions/DefaultExporters/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/extensions/DefaultExporters/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -166,19 +68,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/Tao/Tao.OpenGl/Makefile.in f-spot-0.4.1/Tao/Tao.OpenGl/Makefile.in
---- f-spot-0.4.1~/Tao/Tao.OpenGl/Makefile.in	2007-12-04 13:20:31.000000000 +0100
-+++ f-spot-0.4.1/Tao/Tao.OpenGl/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/FlickrExport/FlickrNet/Makefile.in f-spot-0.4.2/extensions/FlickrExport/FlickrNet/Makefile.in
+--- f-spot-0.4.2~/extensions/FlickrExport/FlickrNet/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/extensions/FlickrExport/FlickrNet/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -189,19 +84,24 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot-0.4.1/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
---- f-spot-0.4.1~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2007-12-04 13:20:31.000000000 +0100
-+++ f-spot-0.4.1/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/FlickrExport/Makefile.am f-spot-0.4.2/extensions/FlickrExport/Makefile.am
+--- f-spot-0.4.2~/extensions/FlickrExport/Makefile.am	2008-02-15 04:26:52.000000000 +0600
++++ f-spot-0.4.2/extensions/FlickrExport/Makefile.am	2008-02-15 11:30:29.000000000 +0600
+@@ -15,7 +15,7 @@
+ 	-r:../../src/FSpot.Core.dll	\
+ 	-r:../../src/FSpot.Utils.dll	\
+ 	-r:../../semweb/SemWeb.dll	\
+-	-r:FlickrNet/FlickrNet.dll	\
++	-r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll	\
+ 	-r:Mono.Posix
+ 
+ PKGS =					\
+diff -urN f-spot-0.4.2~/extensions/FlickrExport/Makefile.in f-spot-0.4.2/extensions/FlickrExport/Makefile.in
+--- f-spot-0.4.2~/extensions/FlickrExport/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/extensions/FlickrExport/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -300,9 +300,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -212,19 +112,21 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/Tao/Tao.OpenGl.Glu/Makefile.in f-spot-0.4.1/Tao/Tao.OpenGl.Glu/Makefile.in
---- f-spot-0.4.1~/Tao/Tao.OpenGl.Glu/Makefile.in	2007-12-04 13:20:31.000000000 +0100
-+++ f-spot-0.4.1/Tao/Tao.OpenGl.Glu/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR =  -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+@@ -326,7 +326,7 @@
+ 	-r:../../src/FSpot.Core.dll	\
+ 	-r:../../src/FSpot.Utils.dll	\
+ 	-r:../../semweb/SemWeb.dll	\
+-	-r:FlickrNet/FlickrNet.dll	\
++	-r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll	\
+ 	-r:Mono.Posix
+ 
+ PKGS = \
+diff -urN f-spot-0.4.2~/extensions/FolderExport/Makefile.in f-spot-0.4.2/extensions/FolderExport/Makefile.in
+--- f-spot-0.4.2~/extensions/FolderExport/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/extensions/FolderExport/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -235,19 +137,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/dbus-sharp/Makefile.in f-spot-0.4.1/dbus-sharp/Makefile.in
---- f-spot-0.4.1~/dbus-sharp/Makefile.in	2007-12-04 13:20:31.000000000 +0100
-+++ f-spot-0.4.1/dbus-sharp/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR =  -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/GalleryExport/Makefile.in f-spot-0.4.2/extensions/GalleryExport/Makefile.in
+--- f-spot-0.4.2~/extensions/GalleryExport/Makefile.in	2008-02-15 04:27:19.000000000 +0600
++++ f-spot-0.4.2/extensions/GalleryExport/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -258,19 +153,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/dbus-sharp-glib/Makefile.in f-spot-0.4.1/dbus-sharp-glib/Makefile.in
---- f-spot-0.4.1~/dbus-sharp-glib/Makefile.in	2007-12-04 13:20:31.000000000 +0100
-+++ f-spot-0.4.1/dbus-sharp-glib/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot-0.4.2/extensions/PicasaWebExport/google-sharp/Makefile.in
+--- f-spot-0.4.2~/extensions/PicasaWebExport/google-sharp/Makefile.in	2008-02-15 04:27:19.000000000 +0600
++++ f-spot-0.4.2/extensions/PicasaWebExport/google-sharp/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -281,19 +169,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/extensions/DefaultExporters/Makefile.in f-spot-0.4.1/extensions/DefaultExporters/Makefile.in
---- f-spot-0.4.1~/extensions/DefaultExporters/Makefile.in	2007-12-04 13:20:32.000000000 +0100
-+++ f-spot-0.4.1/extensions/DefaultExporters/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/PicasaWebExport/Makefile.in f-spot-0.4.2/extensions/PicasaWebExport/Makefile.in
+--- f-spot-0.4.2~/extensions/PicasaWebExport/Makefile.in	2008-02-15 04:27:19.000000000 +0600
++++ f-spot-0.4.2/extensions/PicasaWebExport/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -300,9 +300,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -304,19 +185,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/extensions/GalleryExport/Makefile.in f-spot-0.4.1/extensions/GalleryExport/Makefile.in
---- f-spot-0.4.1~/extensions/GalleryExport/Makefile.in	2007-12-04 13:20:32.000000000 +0100
-+++ f-spot-0.4.1/extensions/GalleryExport/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/SmugMugExport/Makefile.in f-spot-0.4.2/extensions/SmugMugExport/Makefile.in
+--- f-spot-0.4.2~/extensions/SmugMugExport/Makefile.in	2008-02-15 04:27:19.000000000 +0600
++++ f-spot-0.4.2/extensions/SmugMugExport/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -300,9 +300,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -327,19 +201,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/glitz-sharp/src/Makefile.in f-spot-0.4.1/glitz-sharp/src/Makefile.in
---- f-spot-0.4.1~/glitz-sharp/src/Makefile.in	2007-12-04 13:20:32.000000000 +0100
-+++ f-spot-0.4.1/glitz-sharp/src/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot-0.4.2/extensions/SmugMugExport/SmugMugNet/Makefile.in
+--- f-spot-0.4.2~/extensions/SmugMugExport/SmugMugNet/Makefile.in	2008-02-15 04:27:19.000000000 +0600
++++ f-spot-0.4.2/extensions/SmugMugExport/SmugMugNet/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -350,19 +217,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/gnome-keyring-sharp/Makefile.in f-spot-0.4.1/gnome-keyring-sharp/Makefile.in
---- f-spot-0.4.1~/gnome-keyring-sharp/Makefile.in	2007-12-04 13:20:32.000000000 +0100
-+++ f-spot-0.4.1/gnome-keyring-sharp/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/glitz-sharp/src/Makefile.in f-spot-0.4.2/glitz-sharp/src/Makefile.in
+--- f-spot-0.4.2~/glitz-sharp/src/Makefile.in	2008-02-15 04:27:20.000000000 +0600
++++ f-spot-0.4.2/glitz-sharp/src/Makefile.in	2008-02-15 11:30:28.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -373,19 +233,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/google-sharp/Makefile.in f-spot-0.4.1/google-sharp/Makefile.in
---- f-spot-0.4.1~/google-sharp/Makefile.in	2007-12-04 13:20:32.000000000 +0100
-+++ f-spot-0.4.1/google-sharp/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/gnome-keyring-sharp/Makefile.in f-spot-0.4.2/gnome-keyring-sharp/Makefile.in
+--- f-spot-0.4.2~/gnome-keyring-sharp/Makefile.in	2008-02-15 04:27:20.000000000 +0600
++++ f-spot-0.4.2/gnome-keyring-sharp/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -396,19 +249,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/libgphoto2-sharp/Makefile.in f-spot-0.4.1/libgphoto2-sharp/Makefile.in
---- f-spot-0.4.1~/libgphoto2-sharp/Makefile.in	2007-12-04 13:20:33.000000000 +0100
-+++ f-spot-0.4.1/libgphoto2-sharp/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/libgphoto2-sharp/Makefile.in f-spot-0.4.2/libgphoto2-sharp/Makefile.in
+--- f-spot-0.4.2~/libgphoto2-sharp/Makefile.in	2008-02-15 04:27:20.000000000 +0600
++++ f-spot-0.4.2/libgphoto2-sharp/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -419,19 +265,28 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/mono-addins/Mono.Addins/Makefile.in f-spot-0.4.1/mono-addins/Mono.Addins/Makefile.in
---- f-spot-0.4.1~/mono-addins/Mono.Addins/Makefile.in	2007-12-04 13:20:33.000000000 +0100
-+++ f-spot-0.4.1/mono-addins/Mono.Addins/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/Makefile.include f-spot-0.4.2/Makefile.include
+--- f-spot-0.4.2~/Makefile.include	2008-02-15 04:26:58.000000000 +0600
++++ f-spot-0.4.2/Makefile.include	2008-02-15 11:30:28.000000000 +0600
+@@ -28,9 +28,9 @@
+ 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
++	$(shell pkg-config --libs mono-addins)		\
++	$(shell pkg-config --libs mono-addins-setup)	\
++	$(shell pkg-config --libs mono-addins-gui)
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = 								\
+ 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
+diff -urN f-spot-0.4.2~/mono-addins/Mono.Addins/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins/Makefile.in
+--- f-spot-0.4.2~/mono-addins/Mono.Addins/Makefile.in	2008-02-15 04:27:21.000000000 +0600
++++ f-spot-0.4.2/mono-addins/Mono.Addins/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -442,10 +297,10 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/mono-addins/Mono.Addins.Gui/Makefile.am f-spot-0.4.1/mono-addins/Mono.Addins.Gui/Makefile.am
---- f-spot-0.4.1~/mono-addins/Mono.Addins.Gui/Makefile.am	2007-12-04 13:19:24.000000000 +0100
-+++ f-spot-0.4.1/mono-addins/Mono.Addins.Gui/Makefile.am	2007-12-11 21:25:38.000000000 +0100
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/mono-addins/Mono.Addins.Gui/Makefile.am f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.am
+--- f-spot-0.4.2~/mono-addins/Mono.Addins.Gui/Makefile.am	2008-02-15 04:26:57.000000000 +0600
++++ f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.am	2008-02-15 11:30:29.000000000 +0600
 @@ -27,8 +27,8 @@
  REFS =							\
  	-r:Mono.Posix					\
@@ -457,18 +312,11 @@
  
  PKGS =				\
  	-pkg:gnome-sharp-2.0 	\
-diff -urNad f-spot-0.4.1~/mono-addins/Mono.Addins.Gui/Makefile.in f-spot-0.4.1/mono-addins/Mono.Addins.Gui/Makefile.in
---- f-spot-0.4.1~/mono-addins/Mono.Addins.Gui/Makefile.in	2007-12-04 13:20:33.000000000 +0100
-+++ f-spot-0.4.1/mono-addins/Mono.Addins.Gui/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+diff -urN f-spot-0.4.2~/mono-addins/Mono.Addins.Gui/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.in
+--- f-spot-0.4.2~/mono-addins/Mono.Addins.Gui/Makefile.in	2008-02-15 04:27:21.000000000 +0600
++++ f-spot-0.4.2/mono-addins/Mono.Addins.Gui/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -479,8 +327,8 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-@@ -327,8 +327,8 @@
+ LINK_TAO = \
+@@ -328,8 +328,8 @@
  REFS = \
  	-r:Mono.Posix					\
  	-r:System					\
@@ -491,9 +339,9 @@
  
  PKGS = \
  	-pkg:gnome-sharp-2.0 	\
-diff -urNad f-spot-0.4.1~/mono-addins/Mono.Addins.Setup/Makefile.am f-spot-0.4.1/mono-addins/Mono.Addins.Setup/Makefile.am
---- f-spot-0.4.1~/mono-addins/Mono.Addins.Setup/Makefile.am	2007-12-04 13:19:23.000000000 +0100
-+++ f-spot-0.4.1/mono-addins/Mono.Addins.Setup/Makefile.am	2007-12-11 21:25:38.000000000 +0100
+diff -urN f-spot-0.4.2~/mono-addins/Mono.Addins.Setup/Makefile.am f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.am
+--- f-spot-0.4.2~/mono-addins/Mono.Addins.Setup/Makefile.am	2007-12-04 18:19:23.000000000 +0600
++++ f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.am	2008-02-15 11:30:29.000000000 +0600
 @@ -38,7 +38,7 @@
  	-r:Mono.Posix 				\
  	-r:System 				\
@@ -503,18 +351,11 @@
  
  PKGS =
  
-diff -urNad f-spot-0.4.1~/mono-addins/Mono.Addins.Setup/Makefile.in f-spot-0.4.1/mono-addins/Mono.Addins.Setup/Makefile.in
---- f-spot-0.4.1~/mono-addins/Mono.Addins.Setup/Makefile.in	2007-12-04 13:20:33.000000000 +0100
-+++ f-spot-0.4.1/mono-addins/Mono.Addins.Setup/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+diff -urN f-spot-0.4.2~/mono-addins/Mono.Addins.Setup/Makefile.in f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.in
+--- f-spot-0.4.2~/mono-addins/Mono.Addins.Setup/Makefile.in	2008-02-15 04:27:21.000000000 +0600
++++ f-spot-0.4.2/mono-addins/Mono.Addins.Setup/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -525,8 +366,8 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-@@ -338,7 +338,7 @@
+ LINK_TAO = \
+@@ -339,7 +339,7 @@
  	-r:Mono.Posix 				\
  	-r:System 				\
  	-r:System.Xml				\
@@ -535,18 +376,75 @@
  
  PKGS = 
  CSC_EXTRA_FLAGS = -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
-diff -urNad f-spot-0.4.1~/semweb/Makefile.in f-spot-0.4.1/semweb/Makefile.in
---- f-spot-0.4.1~/semweb/Makefile.in	2007-12-04 13:20:33.000000000 +0100
-+++ f-spot-0.4.1/semweb/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -280,15 +280,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+diff -urN f-spot-0.4.2~/semweb/Makefile.in f-spot-0.4.2/semweb/Makefile.in
+--- f-spot-0.4.2~/semweb/Makefile.in	2008-02-15 04:27:21.000000000 +0600
++++ f-spot-0.4.2/semweb/Makefile.in	2008-02-15 11:30:29.000000000 +0600
+@@ -288,9 +288,9 @@
+ 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
++	$(shell pkg-config --libs mono-addins)		\
++	$(shell pkg-config --libs mono-addins-setup)	\
++	$(shell pkg-config --libs mono-addins-gui)
+ 
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/src/Makefile.in f-spot-0.4.2/src/Makefile.in
+--- f-spot-0.4.2~/src/Makefile.in	2008-02-15 04:27:21.000000000 +0600
++++ f-spot-0.4.2/src/Makefile.in	2008-02-15 11:30:28.000000000 +0600
+@@ -292,9 +292,9 @@
+ 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
++	$(shell pkg-config --libs mono-addins)		\
++	$(shell pkg-config --libs mono-addins-setup)	\
++	$(shell pkg-config --libs mono-addins-gui)
+ 
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/Tao/Tao.GlPostProcess/Makefile.in f-spot-0.4.2/Tao/Tao.GlPostProcess/Makefile.in
+--- f-spot-0.4.2~/Tao/Tao.GlPostProcess/Makefile.in	2008-02-15 04:27:17.000000000 +0600
++++ f-spot-0.4.2/Tao/Tao.GlPostProcess/Makefile.in	2008-02-15 11:30:28.000000000 +0600
+@@ -278,9 +278,9 @@
+ 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
++	$(shell pkg-config --libs mono-addins)		\
++	$(shell pkg-config --libs mono-addins-setup)	\
++	$(shell pkg-config --libs mono-addins-gui)
+ 
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/Tao/Tao.OpenGl/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl/Makefile.in
+--- f-spot-0.4.2~/Tao/Tao.OpenGl/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/Tao/Tao.OpenGl/Makefile.in	2008-02-15 11:30:28.000000000 +0600
+@@ -288,9 +288,9 @@
+ 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
++	$(shell pkg-config --libs mono-addins)		\
++	$(shell pkg-config --libs mono-addins-setup)	\
++	$(shell pkg-config --libs mono-addins-gui)
+ 
+ LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
+--- f-spot-0.4.2~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2008-02-15 04:27:17.000000000 +0600
++++ f-spot-0.4.2/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in	2008-02-15 11:30:28.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -557,19 +455,12 @@
 +	$(shell pkg-config --libs mono-addins-gui)
  
  LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
-diff -urNad f-spot-0.4.1~/src/Makefile.in f-spot-0.4.1/src/Makefile.in
---- f-spot-0.4.1~/src/Makefile.in	2007-12-04 13:20:33.000000000 +0100
-+++ f-spot-0.4.1/src/Makefile.in	2007-12-11 21:25:38.000000000 +0100
-@@ -286,15 +286,15 @@
- DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
- DIR_TAO_EXTENSIONLOADER = $(top_builddir)/Tao/Tao.OpenGl.ExtensionLoader
- DIR_TAO_GLPOSTPROCESS = $(top_builddir)/Tao/Tao.GlPostProcess
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
- LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
+ LINK_TAO = \
+diff -urN f-spot-0.4.2~/Tao/Tao.OpenGl.Glu/Makefile.in f-spot-0.4.2/Tao/Tao.OpenGl.Glu/Makefile.in
+--- f-spot-0.4.2~/Tao/Tao.OpenGl.Glu/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/Tao/Tao.OpenGl.Glu/Makefile.in	2008-02-15 11:30:28.000000000 +0600
+@@ -288,9 +288,9 @@
  LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll 
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
  LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
  LINK_MONO_ADDINS = \
 -	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
@@ -583 +474 @@
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
+ LINK_TAO = \
diff -u f-spot-0.4.1/debian/changelog f-spot-0.4.2/debian/changelog
--- f-spot-0.4.1/debian/changelog
+++ f-spot-0.4.2/debian/changelog
@@ -1,3 +1,34 @@
+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 <sikon@lucidfox.org>  Fri, 15 Feb 2008 10:51:31 +0600
+
 f-spot (0.4.1-4ubuntu4) hardy; urgency=low
 
   [ Matvey Kozhev ]
diff -u f-spot-0.4.1/debian/update_src_to_use_system_libs.sh f-spot-0.4.2/debian/update_src_to_use_system_libs.sh
--- f-spot-0.4.1/debian/update_src_to_use_system_libs.sh
+++ f-spot-0.4.2/debian/update_src_to_use_system_libs.sh
@@ -9,7 +9,7 @@
 find . \( -name "*.am" -or -name "*.in*" \) -exec perl -pe 's!-r\:\$\(DIR_ADDINS_SETUP\)/Mono\.Addins\.Setup\.dll!\$(shell pkg-config --libs mono-addins-setup)!g' -i {} \;
 
 echo "Updating FlickrNet references"
-find . \( -name "*.am" -or -name "*.in*" \) -exec perl -pe 's!-r\:\$\(DIR_FLICKR\)/FlickrNet\.dll!/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll!g' -i {} \;
+find extensions/FlickrExport \( -name "*.am" -or -name "*.in*" \) -exec perl -pe 's!-r\:FlickrNet/FlickrNet\.dll!-r\:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll!g' -i {} \;
 
 echo "Deleting reject files (*.rej)"
 find -name "*.rej" -delete
only in patch2:
unchanged:
--- f-spot-0.4.2.orig/debian/patches/disable_bundled_libs_build.dpatch
+++ f-spot-0.4.2/debian/patches/disable_bundled_libs_build.dpatch
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## disable_bundled_libs_build.dpatch by Matvey Kozhev <sikon@lucidfox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable build of bundled Mono.Addins and FlickrNet
+
+@DPATCH@
+
+diff -urN f-spot-0.4.2~/extensions/FlickrExport/Makefile.am f-spot-0.4.2/extensions/FlickrExport/Makefile.am
+--- f-spot-0.4.2~/extensions/FlickrExport/Makefile.am	2008-02-15 04:26:52.000000000 +0600
++++ f-spot-0.4.2/extensions/FlickrExport/Makefile.am	2008-02-15 12:16:51.000000000 +0600
+@@ -22,9 +22,6 @@
+ 	-pkg:gtk-sharp-2.0		\
+ 	-pkg:glade-sharp-2.0
+ 
+-SUBDIRS = 			\
+-	FlickrNet
+-
+ RESOURCES =				\
+ 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
+ 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
+diff -urN f-spot-0.4.2~/extensions/FlickrExport/Makefile.in f-spot-0.4.2/extensions/FlickrExport/Makefile.in
+--- f-spot-0.4.2~/extensions/FlickrExport/Makefile.in	2008-02-15 04:27:18.000000000 +0600
++++ f-spot-0.4.2/extensions/FlickrExport/Makefile.in	2008-02-15 12:17:03.000000000 +0600
+@@ -333,9 +333,6 @@
+ 	-pkg:gtk-sharp-2.0		\
+ 	-pkg:glade-sharp-2.0
+ 
+-SUBDIRS = \
+-	FlickrNet
+-
+ RESOURCES = \
+ 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
+ 	-resource:$(srcdir)/$(PLUGIN_NAME).glade
+diff -urN f-spot-0.4.2~/Makefile.am f-spot-0.4.2/Makefile.am
+--- f-spot-0.4.2~/Makefile.am	2008-02-15 04:26:58.000000000 +0600
++++ f-spot-0.4.2/Makefile.am	2008-02-15 12:25:08.000000000 +0600
+@@ -11,7 +11,6 @@
+ 	libgphoto2-sharp \
+ 	semweb		\
+ 	Tao		\
+-	mono-addins	\
+ 	tools		\
+ 	po		\
+ 	src		\
+diff -urN f-spot-0.4.2~/Makefile.in f-spot-0.4.2/Makefile.in
+--- f-spot-0.4.2~/Makefile.in	2008-02-15 04:27:22.000000000 +0600
++++ f-spot-0.4.2/Makefile.in	2008-02-15 12:25:27.000000000 +0600
+@@ -311,7 +311,6 @@
+ 	libgphoto2-sharp \
+ 	semweb		\
+ 	Tao		\
+-	mono-addins	\
+ 	tools		\
+ 	po		\
+ 	src		\
only in patch2:
unchanged:
--- f-spot-0.4.2.orig/debian/patches/galleryexport_rm.dpatch
+++ f-spot-0.4.2/debian/patches/galleryexport_rm.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## galleryexport_rm.dpatch by Matvey Kozhev <sikon@lucidfox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove command attempting to delete GalleryExport.addin.xml from 
+## DP: GalleryExport makefile
+
+@DPATCH@
+
+diff -urN f-spot-0.4.2~/extensions/GalleryExport/Makefile.am f-spot-0.4.2/extensions/GalleryExport/Makefile.am
+--- f-spot-0.4.2~/extensions/GalleryExport/Makefile.am	2008-02-15 04:26:50.000000000 +0600
++++ f-spot-0.4.2/extensions/GalleryExport/Makefile.am	2008-02-15 11:50:16.000000000 +0600
+@@ -36,7 +36,6 @@
+ plugindir = $(pkglibdir)/extensions
+ 
+ install-data-hook:
+-	rm -f $(plugindir)/GalleryExport.addin.xml
+ 
+ plugin_DATA =			\
+ 	$(PLUGIN_ASSEMBLY)
+diff -urN f-spot-0.4.2~/extensions/GalleryExport/Makefile.in f-spot-0.4.2/extensions/GalleryExport/Makefile.in
+--- f-spot-0.4.2~/extensions/GalleryExport/Makefile.in	2008-02-15 04:27:19.000000000 +0600
++++ f-spot-0.4.2/extensions/GalleryExport/Makefile.in	2008-02-15 11:50:52.000000000 +0600
+@@ -538,7 +538,6 @@
+ 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+ 
+ install-data-hook:
+-	rm -f $(plugindir)/GalleryExport.addin.xml
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: