SOURCES (AC-branch): evolution-data-server-system_db.patch - merge...

baggins baggins at pld-linux.org
Mon May 15 17:26:00 CEST 2006 

Author: baggins                      Date: Mon May 15 15:26:00 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   evolution-data-server-system_db.patch (1.8 -> 1.8.4.1) 

---- Diffs:

================================================================
Index: SOURCES/evolution-data-server-system_db.patch
diff -u SOURCES/evolution-data-server-system_db.patch:1.8 SOURCES/evolution-data-server-system_db.patch:1.8.4.1
--- SOURCES/evolution-data-server-system_db.patch:1.8	Mon Sep  5 20:30:42 2005
+++ SOURCES/evolution-data-server-system_db.patch	Mon May 15 17:25:55 2006
@@ -1,6 +1,31 @@
-diff -urN evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am
---- evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am	2005-08-23 11:04:40.302083616 +0200
-+++ evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am	2005-08-23 11:05:46.385037480 +0200
+diff -aurN evolution-data-server-1.5.5.orig/Makefile.am evolution-data-server-1.5.5/Makefile.am
+--- evolution-data-server-1.5.5.orig/Makefile.am	2005-12-08 08:54:12.000000000 +0100
++++ evolution-data-server-1.5.5/Makefile.am	2006-01-22 21:07:02.287051000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ 
+-SUBDIRS = libdb win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
++SUBDIRS = win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
+ DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
+ 
+ changelogs =			\
+@@ -27,9 +27,10 @@
+ 	intltool-update.in				\
+ 	intltool-extract.in				\
+ 	evolution-data-server-zip.in			\
+-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) 	\
+-	$(LIBDB_FILES)
++	$(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
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
+ distclean-local:
+ 	(cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
+diff -aurN evolution-data-server-1.5.5.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.5.5/addressbook/backends/file/Makefile.am
+--- evolution-data-server-1.5.5.orig/addressbook/backends/file/Makefile.am	2005-06-22 14:34:21.000000000 +0200
++++ evolution-data-server-1.5.5/addressbook/backends/file/Makefile.am	2006-01-22 21:02:28.917051000 +0100
 @@ -4,7 +4,6 @@
  	-I$(top_builddir)				\
  	-I$(top_srcdir)/addressbook			\
@@ -20,10 +45,10 @@
  
  libebookbackendfile_la_LDFLAGS =	\
  	-module -avoid-version $(NO_UNDEFINED)
-diff -urN evolution-data-server-1.3.8.orig/configure.in evolution-data-server-1.3.8/configure.in
---- evolution-data-server-1.3.8.orig/configure.in	2005-08-23 11:04:38.291389288 +0200
-+++ evolution-data-server-1.3.8/configure.in	2005-08-23 11:05:46.387037176 +0200
-@@ -1253,7 +1253,6 @@
+diff -aurN evolution-data-server-1.5.5.orig/configure.in evolution-data-server-1.5.5/configure.in
+--- evolution-data-server-1.5.5.orig/configure.in	2006-01-17 09:48:52.000000000 +0100
++++ evolution-data-server-1.5.5/configure.in	2006-01-22 21:03:31.387051000 +0100
+@@ -1270,7 +1270,6 @@
  export privincludedir
  export privdatadir
  AC_CONFIG_SUBDIRS(calendar/libical)
@@ -31,7 +56,7 @@
  
  AC_OUTPUT([
  Makefile
-@@ -1308,7 +1307,6 @@
+@@ -1328,7 +1327,6 @@
  camel/tests/stream/Makefile
  camel/camel.pc
  camel/camel-provider.pc
@@ -39,18 +64,18 @@
  libedataserver/Makefile
  libedataserver/libedataserver.pc
  libedataserverui/Makefile
-diff -urN evolution-data-server-1.3.8.orig/libedataserver/Makefile.am evolution-data-server-1.3.8/libedataserver/Makefile.am
---- evolution-data-server-1.3.8.orig/libedataserver/Makefile.am	2005-08-23 11:04:40.526049568 +0200
-+++ evolution-data-server-1.3.8/libedataserver/Makefile.am	2005-08-23 11:06:56.983304912 +0200
+diff -aurN evolution-data-server-1.5.5.orig/libedataserver/Makefile.am evolution-data-server-1.5.5/libedataserver/Makefile.am
+--- evolution-data-server-1.5.5.orig/libedataserver/Makefile.am	2006-01-16 09:43:14.000000000 +0100
++++ evolution-data-server-1.5.5/libedataserver/Makefile.am	2006-01-22 21:05:44.877051000 +0100
 @@ -1,7 +1,6 @@
  INCLUDES =								\
  	-I$(top_srcdir)							\
  	-DG_LOG_DOMAIN=\"e-data-server\"				\
 -	-I$(top_srcdir)/libdb/dist					\
+ 	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"				\
+ 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"			\
  	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"		\
- 	-DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\"			\
- 	$(E_DATA_SERVER_CFLAGS)
-@@ -44,7 +43,7 @@
+@@ -49,7 +48,7 @@
  libedataserver_1_2_la_LIBADD = 				\
  	$(E_DATA_SERVER_LIBS)				\
  	$(ICONV_LIBS)					\
@@ -59,28 +84,3 @@
  	$(SOCKET_LIBS)
  
  libedataserver_1_2_la_LDFLAGS = \
-diff -urN evolution-data-server-1.3.8.orig/Makefile.am evolution-data-server-1.3.8/Makefile.am
---- evolution-data-server-1.3.8.orig/Makefile.am	2005-08-23 11:04:40.203098664 +0200
-+++ evolution-data-server-1.3.8/Makefile.am	2005-08-23 11:05:46.390036720 +0200
-@@ -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 =			\
-@@ -26,9 +26,10 @@
- 	intltool-merge.in				\
- 	intltool-update.in				\
- 	intltool-extract.in				\
--	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) 	\
--	$(LIBDB_FILES)
-+	$(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
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
- distclean-local:
- 	(cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
================================================================

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

More information about the pld-cvs-commit mailing list