diff options
| author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
| commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
| tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-connectivity/telepathy | |
| parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
| download | poky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz | |
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.
A number of recipes were modified since dependencies need to be
corrected.
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/telepathy')
5 files changed, 0 insertions, 137 deletions
diff --git a/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch b/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch deleted file mode 100644 index 13e7943da5..0000000000 --- a/meta/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | --- | ||
| 2 | Makefile.am | 2 +- | ||
| 3 | configure.ac | 1 - | ||
| 4 | help/Makefile.am | 1 - | ||
| 5 | 3 files changed, 1 insertion(+), 3 deletions(-) | ||
| 6 | |||
| 7 | --- empathy-0.23.4.orig/Makefile.am | ||
| 8 | +++ empathy-0.23.4/Makefile.am | ||
| 9 | @@ -1,6 +1,6 @@ | ||
| 10 | -SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help | ||
| 11 | +SUBDIRS = tools extensions po data libempathy libempathy-gtk src | ||
| 12 | |||
| 13 | if HAVE_MEGAPHONE | ||
| 14 | SUBDIRS += megaphone | ||
| 15 | endif | ||
| 16 | |||
| 17 | --- empathy-0.23.4.orig/configure.ac | ||
| 18 | +++ empathy-0.23.4/configure.ac | ||
| 19 | @@ -55,11 +55,10 @@ AM_PROG_LIBTOOL | ||
| 20 | AM_PROG_MKDIR_P | ||
| 21 | AM_PATH_GLIB_2_0 | ||
| 22 | AC_PATH_XTRA | ||
| 23 | IT_PROG_INTLTOOL([0.35.0]) | ||
| 24 | GTK_DOC_CHECK([1.3]) | ||
| 25 | -GNOME_DOC_INIT | ||
| 26 | IDT_COMPILE_WARNINGS | ||
| 27 | AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) | ||
| 28 | AC_PATH_PROG(GCONFTOOL, gconftool-2) | ||
| 29 | AM_GCONF_SOURCE_2 | ||
| 30 | GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` | ||
| 31 | --- empathy-0.23.4.orig/help/Makefile.am | ||
| 32 | +++ empathy-0.23.4/help/Makefile.am | ||
| 33 | @@ -1,6 +1,5 @@ | ||
| 34 | -include $(top_srcdir)/gnome-doc-utils.make | ||
| 35 | |||
| 36 | DOC_MODULE = empathy | ||
| 37 | DOC_ENTITIES = legal.xml | ||
| 38 | DOC_FIGURES = \ | ||
| 39 | figures/empathy-main-window.png \ | ||
diff --git a/meta/recipes-connectivity/telepathy/empathy_2.26.1.bb b/meta/recipes-connectivity/telepathy/empathy_2.26.1.bb deleted file mode 100644 index 2e07b19c16..0000000000 --- a/meta/recipes-connectivity/telepathy/empathy_2.26.1.bb +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | SUMMARY = "a Telepathy based IM client" | ||
| 2 | DESCRIPTION = "Instant messaging program supporting text, voice, video, file \ | ||
| 3 | transfers and interapplication communication over many different protocols, \ | ||
| 4 | include: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, \ | ||
| 5 | Gadu-Gadu, Groupwise, ICQ and QQ." | ||
| 6 | HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" | ||
| 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" | ||
| 9 | RDEPENDS = "telepathy-mission-control" | ||
| 10 | RRECOMMENDS = "telepathy-gabble" | ||
| 11 | PR = "r2" | ||
| 12 | |||
| 13 | inherit gnome | ||
| 14 | |||
| 15 | PARALLEL_MAKE = "" | ||
| 16 | |||
| 17 | EXTRA_OECONF += "--disable-scrollkeeper" | ||
| 18 | |||
| 19 | PACKAGES =+ "empathy-scrollkeeper-junk" | ||
| 20 | FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper" | ||
| 21 | |||
| 22 | FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ | ||
| 23 | ${datadir}/dbus-1/services/*.service \ | ||
| 24 | ${datadir}/telepathy/managers/*.chandler \ | ||
| 25 | ${datadir}/icons \ | ||
| 26 | ${libdir}/python*" | ||
| 27 | |||
| 28 | FILES_${PN}-dbg += "${libdir}/python*/*/.debug" | ||
| 29 | |||
diff --git a/meta/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb b/meta/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb deleted file mode 100644 index 3e8d10fe50..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | SUMMARY = "Telepathy fasrsight" | ||
| 2 | DESCRIPTION = "Glue library for telepathy media signalling and the media \ | ||
| 3 | streaming capabilities of Farsight2." | ||
| 4 | HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" | ||
| 5 | DEPENDS = "glib-2.0 dbus telepathy-glib farsight2" | ||
| 6 | LICENSE = "LGPLv2" | ||
| 7 | |||
| 8 | SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${P}.tar.gz \ | ||
| 9 | " | ||
| 10 | |||
| 11 | inherit autotools | ||
| 12 | |||
| 13 | EXTRA_OECONF = "--disable-python" | ||
| 14 | |||
| 15 | AUTOTOOLS_STAGE_PKGCONFIG = "1" | ||
| 16 | |||
| 17 | FILES_${PN} += "${datadir}/telepathy \ | ||
| 18 | ${datadir}/dbus-1" | ||
diff --git a/meta/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager b/meta/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager deleted file mode 100644 index 9000cd41cc..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | |||
| 2 | [ConnectionManager] | ||
| 3 | BusName=org.freedesktop.Telepathy.ConnectionManager.gabble | ||
| 4 | ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble | ||
| 5 | |||
| 6 | [Protocol jabber] | ||
| 7 | param-account=s required register | ||
| 8 | param-password=s required register | ||
| 9 | param-server=s | ||
| 10 | param-resource=s | ||
| 11 | param-priority=n | ||
| 12 | param-port=q | ||
| 13 | param-old-ssl=b | ||
| 14 | param-register=b | ||
| 15 | param-low-bandwidth=b | ||
| 16 | param-https-proxy-server=s | ||
| 17 | param-https-proxy-port=q | ||
| 18 | param-fallback-conference-server=s | ||
| 19 | param-stun-server=s | ||
| 20 | param-stun-port=q | ||
| 21 | param-ignore-ssl-errors=b | ||
| 22 | param-alias=s | ||
| 23 | param-mac=s | ||
| 24 | param-btid=s | ||
| 25 | default-resource=Telepathy | ||
| 26 | default-priority=0 | ||
| 27 | default-port=5222 | ||
| 28 | default-old-ssl=false | ||
| 29 | default-register=false | ||
| 30 | default-low-bandwidth=false | ||
| 31 | default-https-proxy-port=443 | ||
| 32 | default-stun-port=3478 | ||
| 33 | default-ignore-ssl-errors=false | ||
diff --git a/meta/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb b/meta/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb deleted file mode 100644 index ff49418540..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | SUMMARY = "Telepathy Jabber/XMPP connection manager" | ||
| 2 | DESCRIPTION = "Telepathy implementation of the Jabber/XMPP protocols." | ||
| 3 | HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" | ||
| 4 | DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib" | ||
| 5 | LICENSE = "LGPL" | ||
| 6 | |||
| 7 | # gabble.manager needs to get regenerated every release, so please don't copy it over blindly | ||
| 8 | SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \ | ||
| 9 | file://gabble.manager" | ||
| 10 | |||
| 11 | inherit autotools pkgconfig | ||
| 12 | |||
| 13 | do_compile_prepend() { | ||
| 14 | cp ${WORKDIR}/gabble.manager ${S}/data/ | ||
| 15 | } | ||
| 16 | |||
| 17 | FILES_${PN} += "${datadir}/telepathy \ | ||
| 18 | ${datadir}/dbus-1" | ||
