Author: paladine Date: Wed Mar 9 22:24:52 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
evolution-data-server-system_db.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/evolution-data-server-system_db.patch
diff -u SOURCES/evolution-data-server-system_db.patch:1.6
SOURCES/evolution-data-server-system_db.patch:1.7
--- SOURCES/evolution-data-server-system_db.patch:1.6 Sat May 22 15:56:24 2004
+++ SOURCES/evolution-data-server-system_db.patch Wed Mar 9 23:24:47 2005
@@ -1,7 +1,18 @@
-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 @@
+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)
@@ -9,58 +20,56 @@
AC_OUTPUT([
Makefile
-@@ -301,7 +300,6 @@
- calendar/backends/contacts/Makefile
- calendar/tests/Makefile
- calendar/tests/ecal/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
- 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
+ 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\" \
- -I$(top_srcdir)/libdb/dist \
+ -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \
+ -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \
$(E_DATA_SERVER_CFLAGS)
-
- # The marshallers
-@@ -33,9 +32,7 @@
- e-xml-hash-utils.c \
- md5-utils.c
-
--libedataserver_la_LIBADD = \
-- $(E_DATA_SERVER_LIBS) \
+@@ -44,7 +43,7 @@
+ libedataserver_1_2_la_LIBADD = \
+ $(E_DATA_SERVER_LIBS) \
+ $(ICONV_LIBS) \
- $(top_builddir)/libdb/dist/libdb-4.1.la
-+libedataserver_la_LIBADD = -ldb
++ -ldb
- libedataserver_la_LDFLAGS =
\
+ libedataserver_1_2_la_LDFLAGS =
\
-version-info
$(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)
-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
+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 addressbook calendar src docs po
-+SUBDIRS = libedataserver servers addressbook calendar src docs po
- DIST_SUBDIRS= libedataserver servers 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
changelogs = \
-@@ -22,9 +22,10 @@
- intltool-merge.in \
- intltool-update.in \
- intltool-extract.in \
-- $(pkgconfig_DATA:.pc=.pc.in) \
+@@ -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
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+ 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.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
