- updated to 1.0.4

[packages/evolution-data-server.git] / evolution-data-server-system_db.patch

diff --git a/evolution-data-server-system_db.patch b/evolution-data-server-system_db.patch
index a9b7c4e285aa4d7891a98f487b934e96267b4c19..12fd9e8913b6540129520367000296cc7bd240d2 100644 (file)
--- a/evolution-data-server-system_db.patch
+++ b/evolution-data-server-system_db.patch
@@ -1,7 +1,7 @@
-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 evolution-data-server-0.0.93.orig/configure.in evolution-data-server-0.0.93/configure.in
+--- evolution-data-server-0.0.93.orig/configure.in     2004-05-22 12:08:38.934333552 +0200
++++ evolution-data-server-0.0.93/configure.in  2004-05-22 12:11:03.053424120 +0200
+@@ -269,7 +269,6 @@
  export privincludedir
  export privdatadir
  AC_CONFIG_SUBDIRS(calendar/libical)
@@ -9,56 +9,58 @@ diff -Nur evolution-data-server-0.0.3.orig/configure.in evolution-data-server-0.
  
  AC_OUTPUT([
  Makefile
-@@ -285,7 +284,6 @@
- calendar/backends/file/Makefile
- calendar/backends/groupwise/Makefile
- calendar/backends/http/Makefile
+@@ -301,7 +300,6 @@
+ calendar/backends/contacts/Makefile
+ calendar/tests/Makefile
+ calendar/tests/ecal/Makefile
 -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 @@
+ servers/Makefile
+diff -urN evolution-data-server-0.0.93.orig/libedataserver/Makefile.am evolution-data-server-0.0.93/libedataserver/Makefile.am
+--- evolution-data-server-0.0.93.orig/libedataserver/Makefile.am       2004-05-22 12:08:37.715518840 +0200
++++ evolution-data-server-0.0.93/libedataserver/Makefile.am    2004-05-22 12:10:23.587423864 +0200
+@@ -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                                      \
        $(E_DATA_SERVER_CFLAGS)
  
  # The marshallers
-@@ -34,8 +33,7 @@
+@@ -33,9 +32,7 @@
        e-xml-hash-utils.c              \
        md5-utils.c
  
 -libedataserver_la_LIBADD =                            \
--      $(top_builddir)/libdb/dist/libdb.a
+-      $(E_DATA_SERVER_LIBS)                           \
+-      $(top_builddir)/libdb/dist/libdb-4.1.la
 +libedataserver_la_LIBADD = -ldb
  
  libedataserver_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 evolution-data-server-0.0.93.orig/Makefile.am evolution-data-server-0.0.93/Makefile.am
+--- evolution-data-server-0.0.93.orig/Makefile.am      2004-05-22 12:08:38.915336440 +0200
++++ evolution-data-server-0.0.93/Makefile.am   2004-05-22 12:13:09.128257832 +0200
+@@ -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 addressbook calendar src docs po
++SUBDIRS = libedataserver servers addressbook calendar src docs po
+ DIST_SUBDIRS= libedataserver servers addressbook calendar src docs po
  
- ACLOCAL_AMFLAGS = -I m4
-@@ -23,9 +23,10 @@
+ changelogs =                  \
+@@ -22,9 +22,10 @@
        intltool-merge.in       \
        intltool-update.in      \
        intltool-extract.in     \
 -      $(pkgconfig_DATA:.pc=.pc.in) \
 -      $(LIBDB_FILES)
-+      $(pkgconfig_DATA:.pc=.pc.in)
++      $(pkgconfig_DATA:.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
+ distclean-local:
+       (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)