[Pkg-cli-apps-commits] r3547 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/forward_port_to_flickrnet_2.1.5.dpatch patches/link_system_libs.dpatch update_src_to_use_system_libs.sh
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Tue Dec 11 21:51:05 UTC 2007
Author: meebey
Date: Tue Dec 11 21:51:04 2007
New Revision: 3547
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3547
Log:
- pre2
Added:
packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch (with props)
packages/f-spot/trunk/debian/patches/link_system_libs.dpatch (with props)
packages/f-spot/trunk/debian/update_src_to_use_system_libs.sh (with props)
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/patches/00list
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3547&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Tue Dec 11 21:51:04 2007
@@ -21,6 +21,11 @@
+ Refresh the Export and Tools menus on new or removed extensions.
(upstream SVN revision: 3478)
(thanks to Matvey Kozhev <sikon at lucidfox.org> 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/rules:
+ Pass --as-needed to linker for lesser dependencies.
@@ -153,7 +158,7 @@
-- Andrew Mitchell <ajmitch at ubuntu.com> Tue, 7 Nov 2006 11:27:24 +1300
-f-spot (0.2.1-1.1) unstable; urgency=medium
+f-spot (0.2.1-1.1) unstable; urgency=medium
* Non-maintainer upload.
* Fix FTBFS, Kudos to Roland Mas and Mirco Bauer for looking
Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3547&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Dec 11 21:51:04 2007
@@ -1,5 +1,7 @@
11_screensaver-path
+20_refresh-menus-on-extensions
fix_libfspot_linkage
fix_libfspoteog_linkage
fix_libfspotjpegtran_linkage
-20_refresh-menus-on-extensions.dpatch
+link_system_libs
+forward_port_to_flickrnet_2.1.5
Added: packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch?rev=3547&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch Tue Dec 11 21:51:04 2007
@@ -1,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## forward_port_to_flickrnet_2.1.5.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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
+@@ -231,7 +231,7 @@
+ fr = new FlickrRemote (token, current_service);
+ fr.TryWebLogin();
+ CurrentState = State.Connected;
+- } catch (FlickrException e) {
++ } catch (FlickrApiException e) {
+ 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
+@@ -58,7 +58,7 @@
+ if (licenses == null) {
+ try {
+ licenses = flickr.PhotosLicensesGetInfo();
+- } catch (FlickrNet.FlickrException e ) {
++ } catch (FlickrNet.FlickrApiException e ) {
+ Console.WriteLine ( e.Code + ": " + e.Verbose );
+ return null;
+ }
+@@ -111,7 +111,7 @@
+ flickr.AuthToken = token;
+
+ return auth;
+- } catch (FlickrNet.FlickrException ex) {
++ } catch (FlickrNet.FlickrApiException ex) {
+ Console.WriteLine ("ERROR: Problems login in Flickr - "+ex.Verbose);
+
+ return null;
Propchange: packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/f-spot/trunk/debian/patches/link_system_libs.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/link_system_libs.dpatch?rev=3547&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/link_system_libs.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/link_system_libs.dpatch Tue Dec 11 21:51:04 2007
@@ -1,0 +1,583 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## link_system_libs.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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
+ 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_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_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 \
+- -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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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_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 \
+- -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
+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
+@@ -27,8 +27,8 @@
+ REFS = \
+ -r:Mono.Posix \
+ -r:System \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
+- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll
++ $(shell pkg-config --libs mono-addins) \
++ $(shell pkg-config --libs mono-addins-setup)
+
+ 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
+ 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 \
+- -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
+@@ -327,8 +327,8 @@
+ REFS = \
+ -r:Mono.Posix \
+ -r:System \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
+- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll
++ $(shell pkg-config --libs mono-addins) \
++ $(shell pkg-config --libs mono-addins-setup)
+
+ 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
+@@ -38,7 +38,7 @@
+ -r:Mono.Posix \
+ -r:System \
+ -r:System.Xml \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll
++ $(shell pkg-config --libs mono-addins)
+
+ 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
+ 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 \
+- -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
+@@ -338,7 +338,7 @@
+ -r:Mono.Posix \
+ -r:System \
+ -r:System.Xml \
+- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll
++ $(shell pkg-config --libs mono-addins)
+
+ 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
+ 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 \
+- -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
+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_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 \
+- -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
Propchange: packages/f-spot/trunk/debian/patches/link_system_libs.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/f-spot/trunk/debian/update_src_to_use_system_libs.sh
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/update_src_to_use_system_libs.sh?rev=3547&op=file
==============================================================================
--- packages/f-spot/trunk/debian/update_src_to_use_system_libs.sh (added)
+++ packages/f-spot/trunk/debian/update_src_to_use_system_libs.sh Tue Dec 11 21:51:04 2007
@@ -1,0 +1,15 @@
+#!/bin/sh
+# Description: Updates upstream source file to link with system Mono.Addins
+# Author: Mirco Bauer <meebey at debian.org>
+# License: GPL-2
+
+echo "Updating Mono.Addins references"
+find . \( -name "*.am" -or -name "*.in*" \) -exec perl -pe 's!-r\:\$\(DIR_ADDINS_ADDINS\)/Mono\.Addins\.dll!\$(shell pkg-config --libs mono-addins)!g' -i {} \;
+find . \( -name "*.am" -or -name "*.in*" \) -exec perl -pe 's!-r\:\$\(DIR_ADDINS_GUI\)/Mono\.Addins\.Gui\.dll!\$(shell pkg-config --libs mono-addins-gui)!g' -i {} \;
+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 {} \;
+
+echo "Deleting reject files (*.rej)"
+find -name "*.rej" -delete
Propchange: packages/f-spot/trunk/debian/update_src_to_use_system_libs.sh
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-cli-apps-commits
mailing list