summaryrefslogtreecommitdiff
path: root/meta/recipes-sato
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/eds/eds-tools_git.bb4
-rw-r--r--meta/recipes-sato/eds/evolution-data-server-2.20.0/iconv-detect.h (renamed from meta/recipes-sato/eds/eds-dbus-2.20.0/iconv-detect.h)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server-2.20.0/no_iconv_test.patch (renamed from meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server-2.20.0/oh-contact.patch (renamed from meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/depbuildfix.patch (renamed from meta/recipes-sato/eds/eds-dbus/depbuildfix.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/iconv-detect.h (renamed from meta/recipes-sato/eds/eds-dbus/iconv-detect.h)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/new-contact-fix.patch (renamed from meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/nossl.patch (renamed from meta/recipes-sato/eds/eds-dbus/nossl.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/oh-contact.patch (renamed from meta/recipes-sato/eds/eds-dbus/oh-contact.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/old-gdk-api.patch (renamed from meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/optional_imapx_provider.patch (renamed from meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/parallelmake.patch (renamed from meta/recipes-sato/eds/eds-dbus/parallelmake.patch)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server_2.20.0.bb (renamed from meta/recipes-sato/eds/eds-dbus_2.20.0.bb)0
-rw-r--r--meta/recipes-sato/eds/evolution-data-server_git.bb (renamed from meta/recipes-sato/eds/eds-dbus_git.bb)2
-rw-r--r--meta/recipes-sato/pimlico/contacts.inc2
-rw-r--r--meta/recipes-sato/pimlico/contacts_0.9.bb2
-rw-r--r--meta/recipes-sato/pimlico/contacts_git.bb2
-rw-r--r--meta/recipes-sato/pimlico/dates.inc2
-rw-r--r--meta/recipes-sato/pimlico/dates_0.4.8.bb2
-rw-r--r--meta/recipes-sato/pimlico/dates_git.bb2
-rw-r--r--meta/recipes-sato/pimlico/tasks.inc2
-rw-r--r--meta/recipes-sato/pimlico/tasks_0.19.bb2
-rw-r--r--meta/recipes-sato/pimlico/tasks_git.bb2
-rw-r--r--meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb4
24 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-sato/eds/eds-tools_git.bb b/meta/recipes-sato/eds/eds-tools_git.bb
index cf0d72fa9..97279ce76 100644
--- 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
index 46f476d5b..46f476d5b 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 493b70df1..493b70df1 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 cc359ca04..cc359ca04 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 0785a9387..0785a9387 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 46f476d5b..46f476d5b 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 22c293dda..22c293dda 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 67b6d071e..67b6d071e 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 b746044ff..b746044ff 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 7ef2956e3..7ef2956e3 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 d9b094082..d9b094082 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 ee004a953..ee004a953 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 067346aa2..067346aa2 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 74da2ef0d..b2aa08c3e 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
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 e3921d86c..9798985a4 100644
--- 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 2b638bf23..251bbe1d7 100644
--- 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 14ade46fb..45a6a0df4 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 \
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 b3be6b6b0..9b338fd81 100644
--- 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 6eab22823..da3f27349 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 @@
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 a7026a2bd..73258ae96 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 \
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 747840844..9cd525987 100644
--- 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 d79f7c8ea..f0d954212 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
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 728b5e5ca..16c043076 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"
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 2f9d6a6c1..835625c05 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"
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 \