SOURCES (DEVEL): evolution-data-server-system_db.patch - updated f...

[freetz]

Author: freetz                       Date: Sun Jul  3 16:18:01 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- updated for 1.3.4

---- Files affected:
SOURCES:
   evolution-data-server-system_db.patch (1.7 -> 1.7.2.1) 

---- Diffs:

================================================================
Index: SOURCES/evolution-data-server-system_db.patch
diff -u SOURCES/evolution-data-server-system_db.patch:1.7 SOURCES/evolution-data-server-system_db.patch:1.7.2.1
--- SOURCES/evolution-data-server-system_db.patch:1.7	Wed Mar  9 23:24:47 2005
+++ SOURCES/evolution-data-server-system_db.patch	Sun Jul  3 18:17:56 2005
@@ -1,6 +1,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
+diff -aurN evolution-data-server-1.3.4.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.4/addressbook/backends/file/Makefile.am
+--- evolution-data-server-1.3.4.orig/addressbook/backends/file/Makefile.am	2005-06-25 12:17:17.000000000 +0200
++++ evolution-data-server-1.3.4/addressbook/backends/file/Makefile.am	2005-07-03 18:13:06.000000000 +0200
 @@ -4,7 +4,6 @@
  	-I$(top_builddir)				\
  	-I$(top_srcdir)/addressbook			\
@@ -9,10 +9,10 @@
          $(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 @@
+diff -aurN evolution-data-server-1.3.4.orig/configure.in evolution-data-server-1.3.4/configure.in
+--- evolution-data-server-1.3.4.orig/configure.in	2005-07-02 12:09:23.000000000 +0200
++++ evolution-data-server-1.3.4/configure.in	2005-07-03 18:13:40.000000000 +0200
+@@ -1213,7 +1213,6 @@
  export privincludedir
  export privdatadir
  AC_CONFIG_SUBDIRS(calendar/libical)
@@ -20,7 +20,7 @@
  
  AC_OUTPUT([
  Makefile
-@@ -1217,7 +1216,6 @@
+@@ -1268,7 +1267,6 @@
  camel/tests/stream/Makefile
  camel/camel.pc
  camel/camel-provider.pc
@@ -28,9 +28,9 @@
  libedataserver/Makefile
  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
+diff -aurN evolution-data-server-1.3.4.orig/libedataserver/Makefile.am evolution-data-server-1.3.4/libedataserver/Makefile.am
+--- evolution-data-server-1.3.4.orig/libedataserver/Makefile.am	2005-04-11 14:21:32.000000000 +0200
++++ evolution-data-server-1.3.4/libedataserver/Makefile.am	2005-07-03 18:14:15.000000000 +0200
 @@ -1,7 +1,6 @@
  INCLUDES =								\
  	-I$(top_srcdir)							\
@@ -39,34 +39,27 @@
  	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"		\
  	-DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\"			\
  	$(E_DATA_SERVER_CFLAGS)
-@@ -44,7 +43,7 @@
+@@ -44,8 +43,8 @@
  libedataserver_1_2_la_LIBADD = 				\
  	$(E_DATA_SERVER_LIBS)				\
  	$(ICONV_LIBS)					\
 -	$(top_builddir)/libdb/dist/libdb-4.1.la
+-
 +	-ldb
- 
++	
  libedataserver_1_2_la_LDFLAGS = 										\
  	-version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)
-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 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
  
- changelogs =			\
+diff -aurN evolution-data-server-1.3.4.orig/Makefile.am evolution-data-server-1.3.4/Makefile.am
+--- evolution-data-server-1.3.4.orig/Makefile.am	2005-04-11 14:21:26.000000000 +0200
++++ evolution-data-server-1.3.4/Makefile.am	2005-07-03 18:15:13.000000000 +0200
 @@ -26,9 +26,10 @@
  	intltool-merge.in				\
  	intltool-update.in				\
  	intltool-extract.in				\
--	$(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) 	\
+-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) 	\
 -	$(LIBDB_FILES)
-+	$(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in)
++	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
  
 +# files below should be removed due to system db patch, but they are left,
 +# so patch is small
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/evolution-data-server-system_db.patch?r1=1.7&r2=1.7.2.1&f=u