summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-08-19 17:09:36 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-08-19 17:09:36 +0100
commitd0d2cda2f664dfbbbd55329be65856a429da2ebc (patch)
treee4f245f765383a23ed95ad0d899e31c0c8895094
parent214e407cede869547a9db07f0be93de006d58928 (diff)
downloadopenembedded-core-d0d2cda2f664dfbbbd55329be65856a429da2ebc.tar.gz
openembedded-core-d0d2cda2f664dfbbbd55329be65856a429da2ebc.tar.bz2
openembedded-core-d0d2cda2f664dfbbbd55329be65856a429da2ebc.tar.xz
openembedded-core-d0d2cda2f664dfbbbd55329be65856a429da2ebc.zip
telepathy: Sync recipes/versions with OE.dev
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/telepathy/empathy_2.26.1.bb22
-rw-r--r--meta/packages/telepathy/telepathy-farsight_0.0.7.bb16
-rw-r--r--meta/packages/telepathy/telepathy-gabble_0.7.8.bb (renamed from meta/packages/telepathy/telepathy-gabble_0.7.6.bb)0
-rw-r--r--meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch20
-rw-r--r--meta/packages/telepathy/telepathy-mission-control_4.67.bb (renamed from meta/packages/telepathy/telepathy-mission-control_4.61.bb)2
-rw-r--r--meta/packages/telepathy/telepathy-python_0.15.1.bb8
6 files changed, 64 insertions, 4 deletions
diff --git a/meta/packages/telepathy/empathy_2.26.1.bb b/meta/packages/telepathy/empathy_2.26.1.bb
new file mode 100644
index 000000000..3c11913e4
--- /dev/null
+++ b/meta/packages/telepathy/empathy_2.26.1.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Empathy: a Telepathy based IM client"
+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"
+RDEPENDS = "telepathy-mission-control"
+RRECOMMENDS = "telepathy-gabble"
+
+inherit gnome
+
+PARALLEL_MAKE = ""
+
+PACKAGES =+ "empathy-scrollkeeper-junk"
+FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
+
+FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
+ ${datadir}/dbus-1/services/*.service \
+ ${datadir}/telepathy/managers/*.chandler \
+ ${datadir}/icons \
+ ${libdir}/python*"
+
+FILES_${PN}-dbg += "${libdir}/python*/*/.debug"
+
diff --git a/meta/packages/telepathy/telepathy-farsight_0.0.7.bb b/meta/packages/telepathy/telepathy-farsight_0.0.7.bb
new file mode 100644
index 000000000..ee1966b9d
--- /dev/null
+++ b/meta/packages/telepathy/telepathy-farsight_0.0.7.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Telepathy fasrsight"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "glib-2.0 dbus telepathy-glib farsight2"
+LICENSE = "LGPLv2"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${P}.tar.gz \
+"
+
+inherit autotools_stage
+
+EXTRA_OECONF = "--disable-python"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+FILES_${PN} += "${datadir}/telepathy \
+ ${datadir}/dbus-1"
diff --git a/meta/packages/telepathy/telepathy-gabble_0.7.6.bb b/meta/packages/telepathy/telepathy-gabble_0.7.8.bb
index 84eed373f..84eed373f 100644
--- a/meta/packages/telepathy/telepathy-gabble_0.7.6.bb
+++ b/meta/packages/telepathy/telepathy-gabble_0.7.8.bb
diff --git a/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch b/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch
index 847bcaf68..08a53d9e4 100644
--- a/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch
+++ b/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch
@@ -1,12 +1,24 @@
-Index: telepathy-mission-control-4.49/libmissioncontrol.pc.in
+Index: telepathy-mission-control-4.67/libmissioncontrol.pc.in
===================================================================
---- telepathy-mission-control-4.49.orig/libmissioncontrol.pc.in 2008-03-19 22:36:30.000000000 +0000
-+++ telepathy-mission-control-4.49/libmissioncontrol.pc.in 2008-03-19 22:37:27.000000000 +0000
+--- telepathy-mission-control-4.67.orig/libmissioncontrol.pc.in 2008-04-08 12:26:02.000000000 +0100
++++ telepathy-mission-control-4.67/libmissioncontrol.pc.in 2009-08-19 15:55:57.000000000 +0100
@@ -8,5 +8,5 @@
Description: Mission Control Client Library
- Requires: dbus-1 >= 0.50, libtelepathy >= 0.0.54
+ Requires: dbus-1 >= 0.50, libtelepathy >= 0.3.2, telepathy-glib >= 0.7.1
Version: @VERSION@
-Libs: -L${libdir} -lmissioncontrol-client @DBUS_LIBS@
-Cflags: -I${includedir} @DBUS_CFLAGS@
+Libs: -L${libdir} -lmissioncontrol-client
+Cflags: -I${includedir}
+Index: telepathy-mission-control-4.67/libmcclient.pc.in
+===================================================================
+--- telepathy-mission-control-4.67.orig/libmcclient.pc.in 2009-08-19 16:33:46.000000000 +0100
++++ telepathy-mission-control-4.67/libmcclient.pc.in 2009-08-19 16:35:09.000000000 +0100
+@@ -8,5 +8,5 @@
+ Description: Mission Control Client Library
+ Requires: dbus-1 >= 0.50, telepathy-glib >= 0.7.1
+ Version: @VERSION@
+-Libs: -L${libdir} -lmcclient @DBUS_LIBS@
+-Cflags: -I${includedir} @DBUS_CFLAGS@
++Libs: -L${libdir} -lmcclient
++Cflags: -I${includedir}
diff --git a/meta/packages/telepathy/telepathy-mission-control_4.61.bb b/meta/packages/telepathy/telepathy-mission-control_4.67.bb
index 18de11b56..0350fdfb7 100644
--- a/meta/packages/telepathy/telepathy-mission-control_4.61.bb
+++ b/meta/packages/telepathy/telepathy-mission-control_4.67.bb
@@ -7,6 +7,8 @@ DEPENDS = "libtelepathy dbus-glib gconf"
SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz \
file://pkgconfig.patch;patch=1"
+PR = "r1"
+
inherit autotools_stage pkgconfig
PACKAGES =+ " \
diff --git a/meta/packages/telepathy/telepathy-python_0.15.1.bb b/meta/packages/telepathy/telepathy-python_0.15.1.bb
new file mode 100644
index 000000000..0898b321e
--- /dev/null
+++ b/meta/packages/telepathy/telepathy-python_0.15.1.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Telepathy framework - Python package"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+LICENSE = "LGPL"
+RDEPENDS_${PN} += "python-dbus"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz "
+
+inherit distutils