Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-sharp/ChangeLog,v
retrieving revision 1.89
diff -u -B -r1.89 ChangeLog
--- ChangeLog	17 Nov 2006 15:10:13 -0000	1.89
+++ ChangeLog	19 Nov 2006 21:23:00 -0000
@@ -1,3 +1,13 @@
+2006-11-19  Daniel Drake  <dsd@gentoo.org>
+
+	* evolution/evolution-1.8.api.raw,
+	glue/addressbook/e-contact-photo-glue.[ch], evolution/src/ContactPhoto.cs:
+	Import from evolution-sharp-0.12.0, these were not added to CVS.
+
+	* configure.in, evolution/evolution-api-1.[246], evolution/Makefile.am:
+	Remove support for e-d-s versions older than 1.8, we can not compile
+	against them as of 0.12.0
+
 2006-11-17  Veerapuram Varadhan  <vvaradhan@novell.com>
 
 	* evolution/Evolution.metadata: Hide ContactPhoto class from being 
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-sharp/configure.in,v
retrieving revision 1.36
diff -u -B -r1.36 configure.in
--- configure.in	17 Nov 2006 15:10:14 -0000	1.36
+++ configure.in	19 Nov 2006 21:23:00 -0000
@@ -12,34 +12,10 @@
 	AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-PKG_CHECK_MODULES(EDS12, evolution-data-server-1.2 >= 1.2, edsver="1.2", foo=bar)
-PKG_CHECK_MODULES(EDS14, evolution-data-server-1.2 >= 1.4, edsver="1.4", foo=bar)
-PKG_CHECK_MODULES(EDS16, evolution-data-server-1.2 >= 1.6, edsver="1.6", foo=bar)
 PKG_CHECK_MODULES(EDS18, evolution-data-server-1.2 >= 1.8, edsver="1.8", foo=bar)
 
 if test "x$edsver" = "x"; then
-	AC_MSG_ERROR([You need evolution-data-server 1.2.x, 1.4.x, 1.6.x or 1.8.x])
-fi
-
-if test "x$edsver" = "x1.2"; then
-	EDS_VERSION=-1.2
-	EDS_SOVERSION=4
-	EBOOK_SOVERSION=3
-	ECAL_SOVERSION=2
-fi
-
-if test "x$edsver" = "x1.4"; then
-	EDS_VERSION=-1.2
-	EDS_SOVERSION=4
-	EBOOK_SOVERSION=5
-	ECAL_SOVERSION=3
-fi
-
-if test "x$edsver" = "x1.6"; then
-	EDS_VERSION=-1.2
-	EDS_SOVERSION=7
-	EBOOK_SOVERSION=5
-	ECAL_SOVERSION=3
+	AC_MSG_ERROR([You need evolution-data-server 1.8.x])
 fi
 
 if test "x$edsver" = "x1.8"; then
@@ -54,9 +30,6 @@
 AC_SUBST(EBOOK_SOVERSION)
 AC_SUBST(ECAL_SOVERSION)
 
-AM_CONDITIONAL(USE_EDS12, test "x$edsver" = "x1.2")
-AM_CONDITIONAL(USE_EDS14, test "x$edsver" = "x1.4")
-AM_CONDITIONAL(USE_EDS16, test "x$edsver" = "x1.6")
 AM_CONDITIONAL(USE_EDS18, test "x$edsver" = "x1.8")
 
 PKG_CHECK_MODULES(MONO, mono >= 1.0.0)
Index: evolution-sharp.pc.in
===================================================================
RCS file: /cvs/gnome/evolution-sharp/evolution-sharp.pc.in,v
retrieving revision 1.4
diff -u -B -r1.4 evolution-sharp.pc.in
--- evolution-sharp.pc.in	6 Dec 2005 20:36:00 -0000	1.4
+++ evolution-sharp.pc.in	19 Nov 2006 21:23:00 -0000
@@ -1,8 +1,6 @@
 prefix=@prefix@
 libdir=${prefix}/lib
 
-evolibdir=@EVO_SHELL_LIBDIR@
-
 Name: Evolution#
 Description: Evolution# - Evolution .NET Binding
 Version: @VERSION@
Index: evolution/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-sharp/evolution/Makefile.am,v
retrieving revision 1.32
diff -u -B -r1.32 Makefile.am
--- evolution/Makefile.am	17 Nov 2006 15:10:23 -0000	1.32
+++ evolution/Makefile.am	19 Nov 2006 21:23:00 -0000
@@ -1,16 +1,4 @@
-RAW_APIS = evolution-api-1.8.raw evolution-api-1.6.raw evolution-api-1.4.raw evolution-api-1.2.raw
-
-if USE_EDS12
-RAW_API = evolution-api-1.2.raw
-endif
-
-if USE_EDS14
-RAW_API = evolution-api-1.4.raw
-endif
-
-if USE_EDS16
-RAW_API = evolution-api-1.6.raw
-endif
+RAW_APIS = evolution-api-1.8.raw
 
 if USE_EDS18
 RAW_API = evolution-api-1.8.raw