evolation-data-server: Rename from eds-dbus

[YOCTO #2316]

Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
index 6548c206a5ff944b107662e70b896749e7fbc683..42dc4dd33dd67e19da3bd8712630f9249d835ce7 100644 (file)
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
@@ -1,8 +1,8 @@
 require libopensync-plugin_0.36.inc
 LICENSE = "LGPL"
 
-DEPENDS += " eds-dbus"
+DEPENDS += " evolution-data-server"
 
 SRC_URI += "file://0.37-fixes.patch;patch=1"
 
-PR = "r1"
+PR = "r2"

diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
index 2c973ac6649cae1e86ce46417ef9bc9e5658c097..f4f8faec63f049f4cf7900788337d7a1fd30e0fa 100644 (file)
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
+++ b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
@@ -5,10 +5,10 @@ include: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, \
 Gadu-Gadu, Groupwise, ICQ and QQ."
 HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
 LICENSE = "GPL"
-DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
+DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade evolution-data-server"
 RDEPENDS_${PN} = "telepathy-mission-control"
 RRECOMMENDS_${PN} = "telepathy-gabble"
-PR = "r3"
+PR = "r4"
 
 inherit gnome
 

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 8b0d2b5d2ff2b7b5c216ea5fcf83938ae6c319b9..c20961c05e27818c656708fec7ed5b97869add8e 100644 (file)
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5496,18 +5496,18 @@ RECIPE_LAST_UPDATE_pn-libjson = "Nov 29, 2011"
 RECIPE_MAINTAINER_pn-libjson = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 DISTRO_PN_ALIAS_pn-libjson = "Ubuntu=libjson0-dev Debian=libjson0-dev"
 
-RECIPE_STATUS_pn-eds-dbus = "green"
-DISTRO_PN_ALIAS_pn-eds-dbus = "Debian=evolution-data-server Fedora=evolution-data-server Mandriva=evolution-data-server OpenSuSE=evolution-data-server Ubuntu=evolution-data-server"
-RECIPE_DEPENDENCY_CHECK_pn-eds-dbus = "not done"
-RECIPE_LATEST_VERSION_pn-eds-dbus = "2.31.4"
-RECIPE_NO_UPDATE_REASON_pn-eds-dbus = "2.30.2 is latest stable release, while 2.31 branch acts as development branch."
-RECIPE_NO_OF_PATCHES_pn-eds-dbus = "0"
-RECIPE_INTEL_SECTION_pn-eds-dbus = "graphic UX"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-eds-dbus = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-eds-dbus = "Jun 01, 2010"
-RECIPE_COMMENTS_pn-eds-dbus = "Update to 2.30.2 because of stability and dependency"
-RECIPE_LAST_UPDATE_pn-eds-dbus = "Jul 16, 2010"
-RECIPE_MAINTAINER_pn-eds-dbus = "Zhai Edwin <edwin.zhai@intel.com>"
+RECIPE_STATUS_pn-evolution-data-server = "green"
+DISTRO_PN_ALIAS_pn-evolution-data-server = "Debian=evolution-data-server Fedora=evolution-data-server Mandriva=evolution-data-server OpenSuSE=evolution-data-server Ubuntu=evolution-data-server"
+RECIPE_DEPENDENCY_CHECK_pn-evolution-data-server = "not done"
+RECIPE_LATEST_VERSION_pn-evolution-data-server = "2.31.4"
+RECIPE_NO_UPDATE_REASON_pn-evolution-data-server = "2.30.2 is latest stable release, while 2.31 branch acts as development branch."
+RECIPE_NO_OF_PATCHES_pn-evolution-data-server = "0"
+RECIPE_INTEL_SECTION_pn-evolution-data-server = "graphic UX"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-evolution-data-server = "1 month"
+RECIPE_LATEST_RELEASE_DATE_pn-evolution-data-server = "Jun 01, 2010"
+RECIPE_COMMENTS_pn-evolution-data-server = "Update to 2.30.2 because of stability and dependency"
+RECIPE_LAST_UPDATE_pn-evolution-data-server = "Jul 16, 2010"
+RECIPE_MAINTAINER_pn-evolution-data-server = "Zhai Edwin <edwin.zhai@intel.com>"
 
 RECIPE_STATUS_pn-gnome-keyring = "green"
 RECIPE_DEPENDENCY_CHECK_pn-gnome-keyring = "not done"

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 3b47c482bf4662af85f851757bd85f4dd40026ed..f60a89011dd13616e380b03d0602fcf04d83bd17 100644 (file)
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -124,7 +124,7 @@ BBCLASSEXTEND_append_pn-dropbear = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-dtc = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-e2fsprogs = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-ed = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-eds-dbus = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-evolution-data-server = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-eds-tools = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-eee-acpi-scripts = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-eggdbus = " ${MULTILIBS}"

diff --git a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
index d56aa07bb9c75c7edda28acabfd1f6abc6135f2b..29a4f56898a2260c87c69ab4193dc52dcaf121ab 100644 (file)
--- a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r11"
+PR = "r12"
 
 ALLOW_EMPTY = "1"
 

diff --git a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
index 42d41482e9b3eb81cbb9924db4b4b6fd08787990..45b502fe62e3eca4f6d1c3c27ac34da58cb22b3b 100644 (file)
--- a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Gnome Mobile And Embedded Software Development Kit for OE-Core"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r13"
+PR = "r14"
 
 ALLOW_EMPTY = "1"
 

diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
index b24fc9eb913655b195c942f39333b906fcc828b9..f9e373d40a93f097b6225a958143819f90a7006a 100644 (file)
--- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc
+++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc
@@ -7,7 +7,7 @@ SDK-GMAE = " \
     gconf-dev \
     avahi-dev \
     telepathy-glib-dev \
-    eds-dbus-dev \
+    evolution-data-server-dev \
     libecal-dev \
     libebook-dev \
     libxi-dev \

diff --git a/meta/recipes-sato/eds/eds-tools_git.bb b/meta/recipes-sato/eds/eds-tools_git.bb
index cf0d72fa956b3ef7d9b2372f731dc01f746b5a31..97279ce76f95a2b1e0bb33a7a80d400b57caa9af 100644 (file)
--- a/meta/recipes-sato/eds/eds-tools_git.bb
+++ b/meta/recipes-sato/eds/eds-tools_git.bb
@@ -1,11 +1,11 @@
 LICENSE = "GPLv2"
 SECTION = "x11"
-DEPENDS = "dbus-glib eds-dbus"
+DEPENDS = "dbus-glib evolution-data-server"
 RDEPENDS_${PN} = "libedata-book"
 DESCRIPTION = "Test applications for EDS"
 
 SRCREV = "5e9afbd22a021d1f0d0a0249d5995d19dd770584"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "git://github.com/rossburton/eds-tools.git;protocol=git"
 

diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h b/meta/recipes-sato/eds/evolution-data-server-2.20.0/iconv-detect.h
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h
rename to meta/recipes-sato/eds/evolution-data-server-2.20.0/iconv-detect.h

diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch b/meta/recipes-sato/eds/evolution-data-server-2.20.0/no_iconv_test.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
rename to meta/recipes-sato/eds/evolution-data-server-2.20.0/no_iconv_test.patch

diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch b/meta/recipes-sato/eds/evolution-data-server-2.20.0/oh-contact.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
rename to meta/recipes-sato/eds/evolution-data-server-2.20.0/oh-contact.patch

diff --git a/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch b/meta/recipes-sato/eds/evolution-data-server/depbuildfix.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus/depbuildfix.patch
rename to meta/recipes-sato/eds/evolution-data-server/depbuildfix.patch

diff --git a/meta/recipes-sato/eds/eds-dbus/iconv-detect.h b/meta/recipes-sato/eds/evolution-data-server/iconv-detect.h
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus/iconv-detect.h
rename to meta/recipes-sato/eds/evolution-data-server/iconv-detect.h

diff --git a/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch b/meta/recipes-sato/eds/evolution-data-server/new-contact-fix.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch
rename to meta/recipes-sato/eds/evolution-data-server/new-contact-fix.patch

diff --git a/meta/recipes-sato/eds/eds-dbus/nossl.patch b/meta/recipes-sato/eds/evolution-data-server/nossl.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus/nossl.patch
rename to meta/recipes-sato/eds/evolution-data-server/nossl.patch

diff --git a/meta/recipes-sato/eds/eds-dbus/oh-contact.patch b/meta/recipes-sato/eds/evolution-data-server/oh-contact.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus/oh-contact.patch
rename to meta/recipes-sato/eds/evolution-data-server/oh-contact.patch

diff --git a/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch b/meta/recipes-sato/eds/evolution-data-server/old-gdk-api.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
rename to meta/recipes-sato/eds/evolution-data-server/old-gdk-api.patch

diff --git a/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch b/meta/recipes-sato/eds/evolution-data-server/optional_imapx_provider.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
rename to meta/recipes-sato/eds/evolution-data-server/optional_imapx_provider.patch

diff --git a/meta/recipes-sato/eds/eds-dbus/parallelmake.patch b/meta/recipes-sato/eds/evolution-data-server/parallelmake.patch
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus/parallelmake.patch
rename to meta/recipes-sato/eds/evolution-data-server/parallelmake.patch

diff --git a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb b/meta/recipes-sato/eds/evolution-data-server_2.20.0.bb
similarity index 100%
rename from meta/recipes-sato/eds/eds-dbus_2.20.0.bb
rename to meta/recipes-sato/eds/evolution-data-server_2.20.0.bb

diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/evolution-data-server_git.bb
similarity index 99%
rename from meta/recipes-sato/eds/eds-dbus_git.bb
rename to meta/recipes-sato/eds/evolution-data-server_git.bb
index 74da2ef0d38f214a5ec18f30fa49f2b69cec940e..b2aa08c3ea5fcab4501844edb09af8d1fa8bbddc 100644 (file)
--- a/meta/recipes-sato/eds/eds-dbus_git.bb
+++ b/meta/recipes-sato/eds/evolution-data-server_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi
 
 SRCREV = "7337d11aed576e7caaa12b4e881ad8d33668799f"
 PV = "2.30+git${SRCPV}"
-PR = "r6"
+PR = "r0"
 
 SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
            file://oh-contact.patch;striplevel=0 \

diff --git a/meta/recipes-sato/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc
index e3921d86cdce3152f0ae6ee11318a4b545060294..9798985a45b46cd68738fc51400fa1a57808c207 100644 (file)
--- a/meta/recipes-sato/pimlico/contacts.inc
+++ b/meta/recipes-sato/pimlico/contacts.inc
@@ -4,7 +4,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 
 LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus"
+DEPENDS = "glib-2.0 gtk+ evolution-data-server"
 DEPENDS_append_poky = " libowl"
 RDEPENDS_${PN} = "libedata-book"
 

diff --git a/meta/recipes-sato/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb
index 2b638bf2334521455c1227ac6e571e2ebfb00521..251bbe1d7f47fdcdcddeed2bbb8e5d42b211d1dd 100644 (file)
--- a/meta/recipes-sato/pimlico/contacts_0.9.bb
+++ b/meta/recipes-sato/pimlico/contacts_0.9.bb
@@ -1,6 +1,6 @@
 require contacts.inc
 
-PR = "r5"
+PR = "r7"
 
 SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
 

diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb
index 14ade46fb9cda8cbb53d785995ca87f2b40017a5..45a6a0df4ba3e598f20984d1adf999b7bd7f4f4e 100644 (file)
--- a/meta/recipes-sato/pimlico/contacts_git.bb
+++ b/meta/recipes-sato/pimlico/contacts_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933"
 PV = "0.12+git${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/git"
 

diff --git a/meta/recipes-sato/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc
index b3be6b6b00f17f78abe041a15e4285bce4808e01..9b338fd8121cce4cd4d1065cca3d4866f26a15e6 100644 (file)
--- a/meta/recipes-sato/pimlico/dates.inc
+++ b/meta/recipes-sato/pimlico/dates.inc
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 LICENSE = "GPLv2 & GPLv2+ & LGPLv2+"
 
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+DEPENDS = "glib-2.0 gtk+ libglade evolution-data-server"
 RDEPENDS_${PN} = "libedata-cal"
 
 inherit autotools gettext pkgconfig gtk-icon-cache

diff --git a/meta/recipes-sato/pimlico/dates_0.4.8.bb b/meta/recipes-sato/pimlico/dates_0.4.8.bb
index 6eab2282310c3e17b852acb34197bfbc9992f012..da3f27349ce4a9bc46ff349b41e2c79ea193c89d 100644 (file)
--- a/meta/recipes-sato/pimlico/dates_0.4.8.bb
+++ b/meta/recipes-sato/pimlico/dates_0.4.8.bb
@@ -1,5 +1,5 @@
 require dates.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"

diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
index a7026a2bd136a7da3798ba1d7fd3b19da31b0500..73258ae965ddab096b8b192859280a234737589a 100644 (file)
--- a/meta/recipes-sato/pimlico/dates_git.bb
+++ b/meta/recipes-sato/pimlico/dates_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 
 SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4"
 PV = "0.4.11+git${SRCPV}"
-PR = "r6"
+PR = "r7"
 
 S = "${WORKDIR}/git"
 

diff --git a/meta/recipes-sato/pimlico/tasks.inc b/meta/recipes-sato/pimlico/tasks.inc
index 7478408447b8db4cdcccc47043eb4c76a219e396..9cd525987b5a4754e3004c670df27bc7b13cf422 100644 (file)
--- a/meta/recipes-sato/pimlico/tasks.inc
+++ b/meta/recipes-sato/pimlico/tasks.inc
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 LICENSE = "GPLv2 & GPLv2+"
 
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus"
+DEPENDS = "glib-2.0 gtk+ evolution-data-server"
 DEPENDS_append_poky = " libowl"
 
 inherit autotools pkgconfig gtk-icon-cache

diff --git a/meta/recipes-sato/pimlico/tasks_0.19.bb b/meta/recipes-sato/pimlico/tasks_0.19.bb
index d79f7c8ea93078f8773e7044da2c22c09ed3cdca..f0d954212f77ad9a99ec97bbfd481aab375dc316 100644 (file)
--- a/meta/recipes-sato/pimlico/tasks_0.19.bb
+++ b/meta/recipes-sato/pimlico/tasks_0.19.bb
@@ -12,4 +12,4 @@ SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e
 
 OWL_poky = "--with-owl"
 
-PR = "r1"
+PR = "r2"

diff --git a/meta/recipes-sato/pimlico/tasks_git.bb b/meta/recipes-sato/pimlico/tasks_git.bb
index 728b5e5cad63aa7f8e934eb5958dd44f7fd34ad5..16c043076c9d7f5c7a8d73f2d92ab365b594236a 100644 (file)
--- a/meta/recipes-sato/pimlico/tasks_git.bb
+++ b/meta/recipes-sato/pimlico/tasks_git.bb
@@ -4,6 +4,6 @@ SRC_URI = "git://git.gnome.org/${BPN};protocol=git"
 
 SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65"
 PV = "0.13+git${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/git"

diff --git a/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
index 2f9d6a6c10e8f2e446b59d2a02265f3b4719cdf5..835625c056831dfdf20437984fba44a18b009b39 100644 (file)
--- a/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
+++ b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "X11 Pimlico Appications List"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r27"
+PR = "r28"
 
 PACKAGES = "\
     task-core-apps-x11-pimlico \
@@ -26,7 +26,7 @@ WEB ?= ""
 #WEB_mx31ads = ""
 
 RDEPENDS_task-core-apps-x11-pimlico = "\
-    eds-dbus \
+    evolution-data-server \
     contacts \
     dates \
     tasks \

diff --git a/meta/site/arm-common b/meta/site/arm-common
index d5a55b66bdf5047c92c32fa8b34f0639f6effda2..c3ffe08b56e6b5eee85f68e84b5fc52a579d2615 100644 (file)
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -180,5 +180,5 @@ lf_cv_sane_realloc=yes
 # xffm
 jm_cv_func_working_readdir=yes
 
-# eds-dbus
+# evolution-data-server
 ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}

diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index e2796eb3b940e701651af8d012d6d6bc2f5cf8e8..a625f8e47bf9687750fe7748f7b811a3c5fe7061 100644 (file)
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -196,7 +196,7 @@ jm_cv_func_working_readdir=yes
 ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no}
 ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no}
 
-# eds-dbus
+# evolution-data-server
 ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
 
 #dbus

diff --git a/meta/site/mips-linux b/meta/site/mips-linux
index 876d99701f941d2cc30d15df1cc2f6951034e17d..72a54f95e3390db52fb362dcf64ce1bf89287baa 100644 (file)
--- a/meta/site/mips-linux
+++ b/meta/site/mips-linux
@@ -74,6 +74,6 @@ ac_cv_uint=${ac_cv_unit=yes}
 # D-BUS
 ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 
-# eds-dbus
+# evolution-data-server
 ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
 

diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc
index 73167bb144b702f815c19d9612f54680fbf64b85..b23363e1566d3f1b5ac8c005d26c66347bb9df19 100644 (file)
--- a/meta/site/mips-linux-uclibc
+++ b/meta/site/mips-linux-uclibc
@@ -75,6 +75,6 @@ ac_cv_uint=${ac_cv_unit=yes}
 # D-BUS
 ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 
-# eds-dbus
+# evolution-data-server
 ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
 

diff --git a/meta/site/mipsel-linux b/meta/site/mipsel-linux
index 15eded8665ce5b3c6855b4ca7cf769b0cd981d2d..696b1beeb43c0762691607f05a82f109522e6835 100644 (file)
--- a/meta/site/mipsel-linux
+++ b/meta/site/mipsel-linux
@@ -75,5 +75,5 @@ ac_cv_uint=${ac_cv_unit=yes}
 # D-BUS
 ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 
-# eds-dbus
+# evolution-data-server
 ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}