diff options
36 files changed, 39 insertions, 39 deletions
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 6548c206a5..42dc4dd33d 100644 --- 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 @@ | |||
1 | require libopensync-plugin_0.36.inc | 1 | require libopensync-plugin_0.36.inc |
2 | LICENSE = "LGPL" | 2 | LICENSE = "LGPL" |
3 | 3 | ||
4 | DEPENDS += " eds-dbus" | 4 | DEPENDS += " evolution-data-server" |
5 | 5 | ||
6 | SRC_URI += "file://0.37-fixes.patch;patch=1" | 6 | SRC_URI += "file://0.37-fixes.patch;patch=1" |
7 | 7 | ||
8 | PR = "r1" | 8 | 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 2c973ac664..f4f8faec63 100644 --- 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, \ | |||
5 | Gadu-Gadu, Groupwise, ICQ and QQ." | 5 | Gadu-Gadu, Groupwise, ICQ and QQ." |
6 | HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" | 6 | HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" |
7 | LICENSE = "GPL" | 7 | LICENSE = "GPL" |
8 | DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" | 8 | DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade evolution-data-server" |
9 | RDEPENDS_${PN} = "telepathy-mission-control" | 9 | RDEPENDS_${PN} = "telepathy-mission-control" |
10 | RRECOMMENDS_${PN} = "telepathy-gabble" | 10 | RRECOMMENDS_${PN} = "telepathy-gabble" |
11 | PR = "r3" | 11 | PR = "r4" |
12 | 12 | ||
13 | inherit gnome | 13 | inherit gnome |
14 | 14 | ||
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index 8b0d2b5d2f..c20961c05e 100644 --- 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" | |||
5496 | RECIPE_MAINTAINER_pn-libjson = "Nitin A Kamble <nitin.a.kamble@intel.com>" | 5496 | RECIPE_MAINTAINER_pn-libjson = "Nitin A Kamble <nitin.a.kamble@intel.com>" |
5497 | DISTRO_PN_ALIAS_pn-libjson = "Ubuntu=libjson0-dev Debian=libjson0-dev" | 5497 | DISTRO_PN_ALIAS_pn-libjson = "Ubuntu=libjson0-dev Debian=libjson0-dev" |
5498 | 5498 | ||
5499 | RECIPE_STATUS_pn-eds-dbus = "green" | 5499 | RECIPE_STATUS_pn-evolution-data-server = "green" |
5500 | 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" | 5500 | 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" |
5501 | RECIPE_DEPENDENCY_CHECK_pn-eds-dbus = "not done" | 5501 | RECIPE_DEPENDENCY_CHECK_pn-evolution-data-server = "not done" |
5502 | RECIPE_LATEST_VERSION_pn-eds-dbus = "2.31.4" | 5502 | RECIPE_LATEST_VERSION_pn-evolution-data-server = "2.31.4" |
5503 | RECIPE_NO_UPDATE_REASON_pn-eds-dbus = "2.30.2 is latest stable release, while 2.31 branch acts as development branch." | 5503 | RECIPE_NO_UPDATE_REASON_pn-evolution-data-server = "2.30.2 is latest stable release, while 2.31 branch acts as development branch." |
5504 | RECIPE_NO_OF_PATCHES_pn-eds-dbus = "0" | 5504 | RECIPE_NO_OF_PATCHES_pn-evolution-data-server = "0" |
5505 | RECIPE_INTEL_SECTION_pn-eds-dbus = "graphic UX" | 5505 | RECIPE_INTEL_SECTION_pn-evolution-data-server = "graphic UX" |
5506 | RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-eds-dbus = "1 month" | 5506 | RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-evolution-data-server = "1 month" |
5507 | RECIPE_LATEST_RELEASE_DATE_pn-eds-dbus = "Jun 01, 2010" | 5507 | RECIPE_LATEST_RELEASE_DATE_pn-evolution-data-server = "Jun 01, 2010" |
5508 | RECIPE_COMMENTS_pn-eds-dbus = "Update to 2.30.2 because of stability and dependency" | 5508 | RECIPE_COMMENTS_pn-evolution-data-server = "Update to 2.30.2 because of stability and dependency" |
5509 | RECIPE_LAST_UPDATE_pn-eds-dbus = "Jul 16, 2010" | 5509 | RECIPE_LAST_UPDATE_pn-evolution-data-server = "Jul 16, 2010" |
5510 | RECIPE_MAINTAINER_pn-eds-dbus = "Zhai Edwin <edwin.zhai@intel.com>" | 5510 | RECIPE_MAINTAINER_pn-evolution-data-server = "Zhai Edwin <edwin.zhai@intel.com>" |
5511 | 5511 | ||
5512 | RECIPE_STATUS_pn-gnome-keyring = "green" | 5512 | RECIPE_STATUS_pn-gnome-keyring = "green" |
5513 | RECIPE_DEPENDENCY_CHECK_pn-gnome-keyring = "not done" | 5513 | RECIPE_DEPENDENCY_CHECK_pn-gnome-keyring = "not done" |
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 3b47c482bf..f60a89011d 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf | |||
@@ -124,7 +124,7 @@ BBCLASSEXTEND_append_pn-dropbear = " ${MULTILIBS}" | |||
124 | BBCLASSEXTEND_append_pn-dtc = " ${MULTILIBS}" | 124 | BBCLASSEXTEND_append_pn-dtc = " ${MULTILIBS}" |
125 | BBCLASSEXTEND_append_pn-e2fsprogs = " ${MULTILIBS}" | 125 | BBCLASSEXTEND_append_pn-e2fsprogs = " ${MULTILIBS}" |
126 | BBCLASSEXTEND_append_pn-ed = " ${MULTILIBS}" | 126 | BBCLASSEXTEND_append_pn-ed = " ${MULTILIBS}" |
127 | BBCLASSEXTEND_append_pn-eds-dbus = " ${MULTILIBS}" | 127 | BBCLASSEXTEND_append_pn-evolution-data-server = " ${MULTILIBS}" |
128 | BBCLASSEXTEND_append_pn-eds-tools = " ${MULTILIBS}" | 128 | BBCLASSEXTEND_append_pn-eds-tools = " ${MULTILIBS}" |
129 | BBCLASSEXTEND_append_pn-eee-acpi-scripts = " ${MULTILIBS}" | 129 | BBCLASSEXTEND_append_pn-eee-acpi-scripts = " ${MULTILIBS}" |
130 | BBCLASSEXTEND_append_pn-eggdbus = " ${MULTILIBS}" | 130 | 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 d56aa07bb9..29a4f56898 100644 --- 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" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
9 | PR = "r11" | 9 | PR = "r12" |
10 | 10 | ||
11 | ALLOW_EMPTY = "1" | 11 | ALLOW_EMPTY = "1" |
12 | 12 | ||
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 42d41482e9..45b502fe62 100644 --- 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" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
9 | PR = "r13" | 9 | PR = "r14" |
10 | 10 | ||
11 | ALLOW_EMPTY = "1" | 11 | ALLOW_EMPTY = "1" |
12 | 12 | ||
diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc index b24fc9eb91..f9e373d40a 100644 --- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc +++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc | |||
@@ -7,7 +7,7 @@ SDK-GMAE = " \ | |||
7 | gconf-dev \ | 7 | gconf-dev \ |
8 | avahi-dev \ | 8 | avahi-dev \ |
9 | telepathy-glib-dev \ | 9 | telepathy-glib-dev \ |
10 | eds-dbus-dev \ | 10 | evolution-data-server-dev \ |
11 | libecal-dev \ | 11 | libecal-dev \ |
12 | libebook-dev \ | 12 | libebook-dev \ |
13 | libxi-dev \ | 13 | libxi-dev \ |
diff --git a/meta/recipes-sato/eds/eds-tools_git.bb b/meta/recipes-sato/eds/eds-tools_git.bb index cf0d72fa95..97279ce76f 100644 --- a/meta/recipes-sato/eds/eds-tools_git.bb +++ b/meta/recipes-sato/eds/eds-tools_git.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | LICENSE = "GPLv2" | 1 | LICENSE = "GPLv2" |
2 | SECTION = "x11" | 2 | SECTION = "x11" |
3 | DEPENDS = "dbus-glib eds-dbus" | 3 | DEPENDS = "dbus-glib evolution-data-server" |
4 | RDEPENDS_${PN} = "libedata-book" | 4 | RDEPENDS_${PN} = "libedata-book" |
5 | DESCRIPTION = "Test applications for EDS" | 5 | DESCRIPTION = "Test applications for EDS" |
6 | 6 | ||
7 | SRCREV = "5e9afbd22a021d1f0d0a0249d5995d19dd770584" | 7 | SRCREV = "5e9afbd22a021d1f0d0a0249d5995d19dd770584" |
8 | PR = "r1" | 8 | PR = "r3" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/rossburton/eds-tools.git;protocol=git" | 10 | SRC_URI = "git://github.com/rossburton/eds-tools.git;protocol=git" |
11 | 11 | ||
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 index 46f476d5bc..46f476d5bc 100644 --- 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 | |||
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 index 493b70df1f..493b70df1f 100644 --- 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 | |||
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 index cc359ca046..cc359ca046 100644 --- 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 | |||
diff --git a/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch b/meta/recipes-sato/eds/evolution-data-server/depbuildfix.patch index 0785a9387a..0785a9387a 100644 --- a/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch +++ b/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 index 46f476d5bc..46f476d5bc 100644 --- a/meta/recipes-sato/eds/eds-dbus/iconv-detect.h +++ b/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 index 22c293ddab..22c293ddab 100644 --- a/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch +++ b/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 index 67b6d071e0..67b6d071e0 100644 --- a/meta/recipes-sato/eds/eds-dbus/nossl.patch +++ b/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 index b746044ffc..b746044ffc 100644 --- a/meta/recipes-sato/eds/eds-dbus/oh-contact.patch +++ b/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 index 7ef2956e37..7ef2956e37 100644 --- a/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch +++ b/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 index d9b094082c..d9b094082c 100644 --- a/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch +++ b/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 index ee004a9539..ee004a9539 100644 --- a/meta/recipes-sato/eds/eds-dbus/parallelmake.patch +++ b/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 index 067346aa27..067346aa27 100644 --- a/meta/recipes-sato/eds/eds-dbus_2.20.0.bb +++ b/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 index 74da2ef0d3..b2aa08c3ea 100644 --- 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 | |||
12 | 12 | ||
13 | SRCREV = "7337d11aed576e7caaa12b4e881ad8d33668799f" | 13 | SRCREV = "7337d11aed576e7caaa12b4e881ad8d33668799f" |
14 | PV = "2.30+git${SRCPV}" | 14 | PV = "2.30+git${SRCPV}" |
15 | PR = "r6" | 15 | PR = "r0" |
16 | 16 | ||
17 | SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ | 17 | SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ |
18 | file://oh-contact.patch;striplevel=0 \ | 18 | file://oh-contact.patch;striplevel=0 \ |
diff --git a/meta/recipes-sato/pimlico/contacts.inc b/meta/recipes-sato/pimlico/contacts.inc index e3921d86cd..9798985a45 100644 --- a/meta/recipes-sato/pimlico/contacts.inc +++ b/meta/recipes-sato/pimlico/contacts.inc | |||
@@ -4,7 +4,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/" | |||
4 | 4 | ||
5 | LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " | 5 | LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " |
6 | SECTION = "x11" | 6 | SECTION = "x11" |
7 | DEPENDS = "glib-2.0 gtk+ eds-dbus" | 7 | DEPENDS = "glib-2.0 gtk+ evolution-data-server" |
8 | DEPENDS_append_poky = " libowl" | 8 | DEPENDS_append_poky = " libowl" |
9 | RDEPENDS_${PN} = "libedata-book" | 9 | RDEPENDS_${PN} = "libedata-book" |
10 | 10 | ||
diff --git a/meta/recipes-sato/pimlico/contacts_0.9.bb b/meta/recipes-sato/pimlico/contacts_0.9.bb index 2b638bf233..251bbe1d7f 100644 --- a/meta/recipes-sato/pimlico/contacts_0.9.bb +++ b/meta/recipes-sato/pimlico/contacts_0.9.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require contacts.inc | 1 | require contacts.inc |
2 | 2 | ||
3 | PR = "r5" | 3 | PR = "r7" |
4 | 4 | ||
5 | SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" | 5 | SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" |
6 | 6 | ||
diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb index 14ade46fb9..45a6a0df4b 100644 --- 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 \ | |||
7 | 7 | ||
8 | SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933" | 8 | SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933" |
9 | PV = "0.12+git${SRCPV}" | 9 | PV = "0.12+git${SRCPV}" |
10 | PR = "r3" | 10 | PR = "r4" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/meta/recipes-sato/pimlico/dates.inc b/meta/recipes-sato/pimlico/dates.inc index b3be6b6b00..9b338fd812 100644 --- a/meta/recipes-sato/pimlico/dates.inc +++ b/meta/recipes-sato/pimlico/dates.inc | |||
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/" | |||
5 | LICENSE = "GPLv2 & GPLv2+ & LGPLv2+" | 5 | LICENSE = "GPLv2 & GPLv2+ & LGPLv2+" |
6 | 6 | ||
7 | SECTION = "x11" | 7 | SECTION = "x11" |
8 | DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" | 8 | DEPENDS = "glib-2.0 gtk+ libglade evolution-data-server" |
9 | RDEPENDS_${PN} = "libedata-cal" | 9 | RDEPENDS_${PN} = "libedata-cal" |
10 | 10 | ||
11 | inherit autotools gettext pkgconfig gtk-icon-cache | 11 | 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 6eab228231..da3f27349c 100644 --- a/meta/recipes-sato/pimlico/dates_0.4.8.bb +++ b/meta/recipes-sato/pimlico/dates_0.4.8.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require dates.inc | 1 | require dates.inc |
2 | 2 | ||
3 | PR = "r5" | 3 | PR = "r6" |
4 | 4 | ||
5 | SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz" | 5 | 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 a7026a2bd1..73258ae965 100644 --- 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 \ | |||
7 | 7 | ||
8 | SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4" | 8 | SRCREV = "514185dc1f6588085fda41eb59898b93d0487dd4" |
9 | PV = "0.4.11+git${SRCPV}" | 9 | PV = "0.4.11+git${SRCPV}" |
10 | PR = "r6" | 10 | PR = "r7" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/meta/recipes-sato/pimlico/tasks.inc b/meta/recipes-sato/pimlico/tasks.inc index 7478408447..9cd525987b 100644 --- a/meta/recipes-sato/pimlico/tasks.inc +++ b/meta/recipes-sato/pimlico/tasks.inc | |||
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/" | |||
5 | LICENSE = "GPLv2 & GPLv2+" | 5 | LICENSE = "GPLv2 & GPLv2+" |
6 | 6 | ||
7 | SECTION = "x11" | 7 | SECTION = "x11" |
8 | DEPENDS = "glib-2.0 gtk+ eds-dbus" | 8 | DEPENDS = "glib-2.0 gtk+ evolution-data-server" |
9 | DEPENDS_append_poky = " libowl" | 9 | DEPENDS_append_poky = " libowl" |
10 | 10 | ||
11 | inherit autotools pkgconfig gtk-icon-cache | 11 | 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 d79f7c8ea9..f0d954212f 100644 --- 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 | |||
12 | 12 | ||
13 | OWL_poky = "--with-owl" | 13 | OWL_poky = "--with-owl" |
14 | 14 | ||
15 | PR = "r1" | 15 | PR = "r2" |
diff --git a/meta/recipes-sato/pimlico/tasks_git.bb b/meta/recipes-sato/pimlico/tasks_git.bb index 728b5e5cad..16c043076c 100644 --- 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" | |||
4 | 4 | ||
5 | SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65" | 5 | SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65" |
6 | PV = "0.13+git${SRCPV}" | 6 | PV = "0.13+git${SRCPV}" |
7 | PR = "r2" | 7 | PR = "r3" |
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | 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 2f9d6a6c10..835625c056 100644 --- 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" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 7 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 8 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
9 | PR = "r27" | 9 | PR = "r28" |
10 | 10 | ||
11 | PACKAGES = "\ | 11 | PACKAGES = "\ |
12 | task-core-apps-x11-pimlico \ | 12 | task-core-apps-x11-pimlico \ |
@@ -26,7 +26,7 @@ WEB ?= "" | |||
26 | #WEB_mx31ads = "" | 26 | #WEB_mx31ads = "" |
27 | 27 | ||
28 | RDEPENDS_task-core-apps-x11-pimlico = "\ | 28 | RDEPENDS_task-core-apps-x11-pimlico = "\ |
29 | eds-dbus \ | 29 | evolution-data-server \ |
30 | contacts \ | 30 | contacts \ |
31 | dates \ | 31 | dates \ |
32 | tasks \ | 32 | tasks \ |
diff --git a/meta/site/arm-common b/meta/site/arm-common index d5a55b66bd..c3ffe08b56 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common | |||
@@ -180,5 +180,5 @@ lf_cv_sane_realloc=yes | |||
180 | # xffm | 180 | # xffm |
181 | jm_cv_func_working_readdir=yes | 181 | jm_cv_func_working_readdir=yes |
182 | 182 | ||
183 | # eds-dbus | 183 | # evolution-data-server |
184 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} | 184 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} |
diff --git a/meta/site/ix86-common b/meta/site/ix86-common index e2796eb3b9..a625f8e47b 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common | |||
@@ -196,7 +196,7 @@ jm_cv_func_working_readdir=yes | |||
196 | ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no} | 196 | ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no} |
197 | ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no} | 197 | ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no} |
198 | 198 | ||
199 | # eds-dbus | 199 | # evolution-data-server |
200 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} | 200 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} |
201 | 201 | ||
202 | #dbus | 202 | #dbus |
diff --git a/meta/site/mips-linux b/meta/site/mips-linux index 876d99701f..72a54f95e3 100644 --- a/meta/site/mips-linux +++ b/meta/site/mips-linux | |||
@@ -74,6 +74,6 @@ ac_cv_uint=${ac_cv_unit=yes} | |||
74 | # D-BUS | 74 | # D-BUS |
75 | ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} | 75 | ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} |
76 | 76 | ||
77 | # eds-dbus | 77 | # evolution-data-server |
78 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} | 78 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} |
79 | 79 | ||
diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc index 73167bb144..b23363e156 100644 --- a/meta/site/mips-linux-uclibc +++ b/meta/site/mips-linux-uclibc | |||
@@ -75,6 +75,6 @@ ac_cv_uint=${ac_cv_unit=yes} | |||
75 | # D-BUS | 75 | # D-BUS |
76 | ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} | 76 | ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} |
77 | 77 | ||
78 | # eds-dbus | 78 | # evolution-data-server |
79 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} | 79 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} |
80 | 80 | ||
diff --git a/meta/site/mipsel-linux b/meta/site/mipsel-linux index 15eded8665..696b1beeb4 100644 --- a/meta/site/mipsel-linux +++ b/meta/site/mipsel-linux | |||
@@ -75,5 +75,5 @@ ac_cv_uint=${ac_cv_unit=yes} | |||
75 | # D-BUS | 75 | # D-BUS |
76 | ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} | 76 | ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} |
77 | 77 | ||
78 | # eds-dbus | 78 | # evolution-data-server |
79 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} | 79 | ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} |