2 files changed, 34 insertions, 20 deletions

diff --git a/meta/packages/eds/eds-dbus/no_libedataserverui.patch b/meta/packages/eds/eds-dbus/no_libedataserverui.patch
index 766c547a56..1a74a5a7fa 100644
--- a/meta/packages/eds/eds-dbus/no_libedataserverui.patch
+++ b/meta/packages/eds/eds-dbus/no_libedataserverui.patch
@@ -11,3 +11,16 @@ Index: Makefile.am
  else
  SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po
  endif
+Index: configure.in
+===================================================================
+--- trunk/configure.in  (revision 524)
++++ trunk/configure.in  (working copy)
+@@ -1215,7 +1215,7 @@
+ AC_SUBST(E_DATA_SERVER_CFLAGS)
+ AC_SUBST(E_DATA_SERVER_LIBS)
+ 
+-E_DATA_SERVER_UI_DEPS="libxml-2.0 gtk+-2.0 libglade-2.0 gconf-2.0"
++E_DATA_SERVER_UI_DEPS="libxml-2.0 gtk+-2.0 gconf-2.0"
+ 
+ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
+ AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
index 69aa3deecb..45366b3912 100755
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Evolution database backend server"
 HOMEPAGE = "http://projects.o-hand.com/eds"
 LICENSE = "LGPL"
-DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool"
+DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool"
 
 PV = "1.4.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://no_libdb.patch;patch=1 \
@@ -23,30 +23,31 @@ EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-sou
 
 acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
 
-PACKAGES =+ "libcamel-provider libcamel libebook libecal libedata-book libedata-cal libedataserver"
+PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev"
 
-FILES_libcamel-provider = "${libdir}/libcamel-provider-1.2.so.*"
-FILES_libcamel = "${libdir}/libcamel-1.2.so.*"
-FILES_libebook = "${libdir}/libebook-1.2*"
-FILES_libecal = "${libdir}/libecal-1.2.so.*"
-FILES_libedata-book = "${libdir}/libedata-book-1.2.so.*"
-FILES_libedata-cal = "${libdir}/libedata-cal-1.2.so.*"
-FILES_libedataserver = "${libdir}/libedataserver-1.2.so.*"
+FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
+FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug ${libdir}/evolution-data-server*/extensions/.debug/"
 
-FILES_${PN} += "${libdir}/evolution-data-server-1.2/extensions/*.so \
-                ${libdir}/evolution-data-server-1.2/camel-providers/*.so \
-                ${libdir}/evolution-data-server-1.2/camel-providers/*.urls \
-                ${datadir}/evolution-data-server-1.4/zoneinfo/zones.tab \
-                ${datadir}/evolution-data-server-1.4/zoneinfo/*/*.ics \
-                ${datadir}/evolution-data-server-1.4/zoneinfo/*/*/*.ics \
-                ${datadir}/dbus-1/services/*.service"
-FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \
-                    ${libdir}/evolution-data-server-1.2/camel-providers/*.la"
+FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* ${libdir}/libcamel-provider-*.so.* ${libdir}/evolution-data-server-*/camel-providers/*.so ${libdir}/evolution-data-server-*/camel-providers/*.urls"
+FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so ${libdir}/pkgconfig/camel*pc ${includedir}/evolution-data-server*/camel"
 
+FILES_libebook = "${libdir}/libebook-*.so.*"
+FILES_libebook-dev = "${libdir}/libebook-1.2.so ${libdir}/pkgconfig/libebook-*.pc ${includedir}/evolution-data-server*/libebook/*.h"
+
+FILES_libecal = "${libdir}/libecal-*.so.* ${datadir}/evolution-data-server-1.4/zoneinfo"
+FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc ${includedir}/evolution-data-server*/libecal/*.h ${includedir}/evolution-data-server*/libical/*.h"
+
+FILES_libedata-book = "${libexecdir}/e-addressbook-factory ${datadir}/dbus-1/services/*.AddressBook.service ${libdir}/libedata-book-*.so.* ${libdir}/evolution-data-server-*/extensions/libebook*.so"
+FILES_libedata-book-dev = "${libdir}/libedata-book-*.so ${libdir}/pkgconfig/libedata-book-*.pc ${includedir}/evolution-data-server-*/libedata-book"
+
+FILES_libedata-cal = "${libexecdir}/e-calendar-factory ${datadir}/dbus-1/services/*.Calendar.service ${libdir}/libedata-cal-*.so.* ${libdir}/evolution-data-server-*/extensions/libecal*.so"
+FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so ${libdir}/pkgconfig/libedata-cal-*.pc ${includedir}/evolution-data-server-*/libedata-cal"
+
+FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
+FILES_libedataserver-dev = "${libdir}/libedataserver-*.so ${libdir}/pkgconfig/libedataserver-*.pc ${includedir}/evolution-data-server-*/libedataserver/*.h"
 
 do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
 
 do_stage () {
         autotools_stage_all
 }
-