Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/f-spot/ChangeLog,v
retrieving revision 1.1585
diff -u -p -r1.1585 ChangeLog
--- ChangeLog	25 Sep 2006 21:25:08 -0000	1.1585
+++ ChangeLog	26 Sep 2006 10:11:18 -0000
@@ -1,3 +1,15 @@
+2006-09-26  Stephane Delcroix  <stephane@delcroix.org>
+
+	* FlickerNet/Makefile.am:
+	* configure.in:
+	* libgphoto2-sharp/Makefile.am:
+	* semweb/Makefile.am:
+	* src/Makefile.am:
+	* google-sharp/Makefile.am:
+	* gnome-keyring-sharp/Makfile.am: Switch the buildsystem from mcs to
+	gmcs/2.0. Updated version of the patch from Ruben Vermeersch. Fix
+	b.g.o #346977
+
 2006-09-25  Gabriel Burt  <gabriel.burt@gmail.com>
 
 	* icons/f-spot-not.png:
Index: configure.in
===================================================================
RCS file: /cvs/gnome/f-spot/configure.in,v
retrieving revision 1.109
diff -u -p -r1.109 configure.in
--- configure.in	19 Sep 2006 20:51:48 -0000	1.109
+++ configure.in	26 Sep 2006 10:11:18 -0000
@@ -16,10 +16,10 @@ AM_PROG_LIBTOOL
 GNOME_COMPILE_WARNINGS
 AM_PATH_GLIB_2_0
 
-dnl --- Check for mono and mcs
+dnl --- Check for mono and gmcs
 
 AC_PATH_PROG(MONO, mono)
-AC_PATH_PROG(MCS, mcs)
+AC_PATH_PROG(MCS, gmcs)
 
 dnl -- Check for mono pc file
 
Index: FlickrNet/Makefile.am
===================================================================
RCS file: /cvs/gnome/f-spot/FlickrNet/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- FlickrNet/Makefile.am	6 Feb 2006 05:45:33 -0000	1.1
+++ FlickrNet/Makefile.am	26 Sep 2006 10:11:18 -0000
@@ -1,4 +1,4 @@
-CSC = mcs
+CSC = gmcs
 
 LIBFLICKRNET_CSFILES =				\
 	$(srcdir)/AssemblyInfo.cs \
Index: gnome-keyring-sharp/Makefile.am
===================================================================
RCS file: /cvs/gnome/f-spot/gnome-keyring-sharp/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- gnome-keyring-sharp/Makefile.am	22 Sep 2006 20:24:24 -0000	1.2
+++ gnome-keyring-sharp/Makefile.am	26 Sep 2006 10:11:18 -0000
@@ -1,4 +1,4 @@
-CSC = mcs
+CSC = gmcs
 
 LIBGNOMEKEYRING_CSFILES =				\
 	$(srcdir)/AccessRights.cs  \
Index: google-sharp/Makefile.am
===================================================================
RCS file: /cvs/gnome/f-spot/google-sharp/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- google-sharp/Makefile.am	22 Sep 2006 20:22:56 -0000	1.3
+++ google-sharp/Makefile.am	26 Sep 2006 10:11:18 -0000
@@ -1,4 +1,4 @@
-CSC = mcs
+CSC = gmcs
 
 LIBGOOGLESHARP_CSFILES =				\
 	$(srcdir)/AlbumAccess.cs  \
Index: libgphoto2-sharp/Makefile.am
===================================================================
RCS file: /cvs/gnome/f-spot/libgphoto2-sharp/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- libgphoto2-sharp/Makefile.am	18 Mar 2005 19:31:52 -0000	1.4
+++ libgphoto2-sharp/Makefile.am	26 Sep 2006 10:11:18 -0000
@@ -1,4 +1,4 @@
-CSC = mcs --unsafe -g
+CSC = gmcs --unsafe -g
 
 LIBGPHOTO2_SHARP_CSFILES =				\
 	$(srcdir)/AssemblyInfo.cs			\
Index: semweb/Makefile.am
===================================================================
RCS file: /cvs/gnome/f-spot/semweb/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- semweb/Makefile.am	12 Sep 2006 04:39:30 -0000	1.2
+++ semweb/Makefile.am	26 Sep 2006 10:11:19 -0000
@@ -1,4 +1,4 @@
-CSC = mcs -g
+CSC = gmcs -g
 
 SEMWEB_CSFILES =            			\
                 $(srcdir)/AssemblyInfo.cs       \
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/f-spot/src/Makefile.am,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile.am
--- src/Makefile.am	15 Sep 2006 14:28:41 -0000	1.70
+++ src/Makefile.am	26 Sep 2006 10:11:19 -0000
@@ -1,4 +1,4 @@
-CSC = mcs
+CSC = gmcs
 CSFLAGS = -unsafe -debug -nowarn:0618 -nowarn:0169 -nowarn:0612 -d:TEST_METADATA 
 
 F_SPOT_CSDISTFILES =				\
