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

[Stephane Delcroix <sdelcroix src gnome org>]

commit ac86819e479e711628542d6cf746d2a6ad200b23
Merge: 8cca4c6... c45bc4f...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Fri Sep 25 22:39:14 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 configure.ac                       |    7 ++++++-
 lib/libgphoto2-sharp/Camera.cs     |   11 ++++++++++-
 lib/libgphoto2-sharp/CameraFile.cs |   17 +++++++++++++++++
 lib/libgphoto2-sharp/Makefile.am   |    4 ++--
 lib/libgphoto2-sharp/Port.cs       |    7 ++++++-
 src/GPhotoCamera.cs                |   17 +++++++++++++++--
 6 files changed, 56 insertions(+), 7 deletions(-)
---
diff --cc configure.ac
index 319f5c0,399ba6b..32a9b73
--- a/configure.ac
+++ b/configure.ac
@@@ -149,11 -125,25 +149,10 @@@ PKG_CHECK_MODULES(BEAGLE, beagle-0.0 >
  AC_SUBST(BEAGLE_DIR)
  AC_SUBST(LINK_BEAGLE)
  
- AC_SUBST(CSC_DEFINES)
  
 -dnl -- dbus-sharp: link or bundle ?
 -PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
 -[
 -	LINK_DBUS="-pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0"
 -	DIR_DBUS=""
 -	DIR_DBUS_GLIB=""
 -	PATH_DBUS=""
 -],
 -[
 -	LINK_DBUS='-r:$(top_builddir)/lib/dbus-sharp/NDesk.DBus.dll -r:$(top_builddir)/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll'
 -	DIR_DBUS="dbus-sharp"
 -	DIR_DBUS_GLIB="dbus-sharp-glib"
 -	PATH_DBUS='../lib/dbus-sharp:../lib/dbus-sharp-glib:'
 -])
 -AC_SUBST(DIR_DBUS)
 -AC_SUBST(DIR_DBUS_GLIB)
 -AC_SUBST(LINK_DBUS)
 -AC_SUBST(PATH_DBUS)
 +dnl -- dbus-sharp
 +PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
 +AC_SUBST(NDESK_DBUS_LIBS)
  
  dnl -- nunit
  PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED,