-diff -Nur evolution-data-server-0.0.3.orig/configure.in evolution-data-server-0.0.3/configure.in
---- evolution-data-server-0.0.3.orig/configure.in 2003-12-08 01:09:35.000000000 +0100
-+++ evolution-data-server-0.0.3/configure.in 2003-12-15 16:57:54.000000000 +0100
-@@ -257,7 +257,6 @@
+diff -urN aa/evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am
+--- aa/evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am 2004-10-14 17:50:17.000000000 +0200
++++ evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am 2005-02-07 17:12:29.879046432 +0100
+@@ -4,7 +4,6 @@
+ -I$(top_builddir) \
+ -I$(top_srcdir)/addressbook \
+ -I$(top_builddir)/addressbook \
+- -I$(top_srcdir)/libdb/dist \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ extension_LTLIBRARIES = libebookbackendfile.la
+diff -urN aa/evolution-data-server-1.1.4.2/configure.in evolution-data-server-1.1.4.2/configure.in
+--- aa/evolution-data-server-1.1.4.2/configure.in 2005-01-26 18:50:11.000000000 +0100
++++ evolution-data-server-1.1.4.2/configure.in 2005-02-07 17:09:29.476471792 +0100
+@@ -1163,7 +1163,6 @@
export privincludedir
export privdatadir
AC_CONFIG_SUBDIRS(calendar/libical)
AC_OUTPUT([
Makefile
-@@ -285,7 +284,6 @@
- calendar/backends/file/Makefile
- calendar/backends/groupwise/Makefile
- calendar/backends/http/Makefile
+@@ -1217,7 +1216,6 @@
+ camel/tests/stream/Makefile
+ camel/camel.pc
+ camel/camel-provider.pc
-libdb/Makefile
libedataserver/Makefile
- libedataserver/libedataserver-1.0.pc
- src/Makefile
-diff -Nur evolution-data-server-0.0.3.orig/libedataserver/Makefile.am evolution-data-server-0.0.3/libedataserver/Makefile.am
---- evolution-data-server-0.0.3.orig/libedataserver/Makefile.am 2003-12-01 19:04:04.000000000 +0100
-+++ evolution-data-server-0.0.3/libedataserver/Makefile.am 2003-12-15 16:57:54.000000000 +0100
-@@ -2,7 +2,6 @@
+ libedataserver/libedataserver.pc
+ libedataserverui/Makefile
+diff -urN aa/evolution-data-server-1.1.4.2/libedataserver/Makefile.am evolution-data-server-1.1.4.2/libedataserver/Makefile.am
+--- aa/evolution-data-server-1.1.4.2/libedataserver/Makefile.am 2005-01-10 17:00:02.000000000 +0100
++++ evolution-data-server-1.1.4.2/libedataserver/Makefile.am 2005-02-07 17:10:18.724984880 +0100
+@@ -1,7 +1,6 @@
+ INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"e-data-server\" \
- -DG_DISABLE_DEPRECATED \
-- -I$(top_srcdir)/libdb/dist \
+- -I$(top_srcdir)/libdb/dist \
+ -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \
+ -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \
$(E_DATA_SERVER_CFLAGS)
+@@ -44,7 +43,7 @@
+ libedataserver_1_2_la_LIBADD = \
+ $(E_DATA_SERVER_LIBS) \
+ $(ICONV_LIBS) \
+- $(top_builddir)/libdb/dist/libdb-4.1.la
++ -ldb
- # The marshallers
-@@ -34,8 +33,7 @@
- e-xml-hash-utils.c \
- md5-utils.c
-
--libedataserver_la_LIBADD = \
-- $(top_builddir)/libdb/dist/libdb.a
-+libedataserver_la_LIBADD = -ldb
-
- libedataserver_la_LDFLAGS = \
+ libedataserver_1_2_la_LDFLAGS = \
-version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)
-diff -Nur evolution-data-server-0.0.3.orig/Makefile.am evolution-data-server-0.0.3/Makefile.am
---- evolution-data-server-0.0.3.orig/Makefile.am 2003-11-26 18:10:38.000000000 +0100
-+++ evolution-data-server-0.0.3/Makefile.am 2003-12-15 16:59:35.000000000 +0100
-@@ -1,6 +1,6 @@
+diff -urN aa/evolution-data-server-1.1.4.2/Makefile.am evolution-data-server-1.1.4.2/Makefile.am
+--- aa/evolution-data-server-1.1.4.2/Makefile.am 2005-01-10 16:59:52.000000000 +0100
++++ evolution-data-server-1.1.4.2/Makefile.am 2005-02-07 17:11:27.480532448 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--SUBDIRS = libdb libedataserver addressbook calendar src docs po
-+SUBDIRS = libedataserver addressbook calendar src docs po
- DIST_SUBDIRS= libedataserver addressbook calendar src docs po
+-SUBDIRS = libdb libedataserver servers camel addressbook calendar libedataserverui src docs art po
++SUBDIRS = libedataserver servers camel addressbook calendar libedataserverui src docs art po
+ DIST_SUBDIRS= libedataserver servers camel addressbook calendar libedataserverui src docs art po
- ACLOCAL_AMFLAGS = -I m4
-@@ -23,9 +23,10 @@
- intltool-merge.in \
- intltool-update.in \
- intltool-extract.in \
-- $(pkgconfig_DATA:.pc=.pc.in) \
+ changelogs = \
+@@ -26,9 +26,10 @@
+ intltool-merge.in \
+ intltool-update.in \
+ intltool-extract.in \
+- $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) \
- $(LIBDB_FILES)
-+ $(pkgconfig_DATA:.pc=.pc.in)
++ $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in)
+# files below should be removed due to system db patch, but they are left,
+# so patch is small
- LIBDB_FILES= \
- $(srcdir)/libdb/Makefile.am \
- $(srcdir)/libdb/Makefile.in \
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
+ distclean-local:
+ (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)