[f-spot: 4/4] Merge branch 'FSPOT_0_6_0_STABLE'

[Stephane Delcroix <sdelcroix src gnome org>]

commit b511cedb112b155efb881a72534cbf64796214f4
Merge: ddb045c... dbf40b7...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Thu Aug 20 13:57:47 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 extensions/Exporters/ZipExport/Makefile.am |    3 ++-
 extensions/Tools/RawPlusJpeg/Makefile.am   |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --cc extensions/Exporters/ZipExport/Makefile.am
index b7d3bd3,8a2584f..32deeab
--- a/extensions/Exporters/ZipExport/Makefile.am
+++ b/extensions/Exporters/ZipExport/Makefile.am
@@@ -16,6 -16,9 +16,8 @@@ REFS =					
  	$(LINK_SEMWEB)				\
  	$(LINK_MONO_ADDINS)			\
  	$(LINK_GPHOTO2)				\
 -	$(LINK_DBUS)				\
+ 	$(LINK_GTKSHARPBEANS)		\
+ 	$(LINK_GIOSHARP)		\
  	-r:System.Web			\
  	-r:ICSharpCode.SharpZipLib	\
  	-r:Mono.Posix
diff --cc extensions/Tools/RawPlusJpeg/Makefile.am
index c4cb3e9,a9a6607..34f2701
--- a/extensions/Tools/RawPlusJpeg/Makefile.am
+++ b/extensions/Tools/RawPlusJpeg/Makefile.am
@@@ -15,8 -15,11 +15,10 @@@ REFS =					
  	-r:$(top_builddir)/src/FSpot.Core.dll	\
  	-r:$(top_builddir)/src/FSpot.Utils.dll	\
  	-r:$(top_builddir)/src/FSpot.Query.dll	\
+ 	$(LINK_GTKSHARPBEANS)		\
+ 	$(LINK_GIOSHARP)		\
  	$(LINK_SEMWEB)				\
  	$(LINK_MONO_ADDINS)			\
 -	$(LINK_DBUS)			\
  	$(LINK_GPHOTO2)
  
  PKGS =					\