From 29d6678fd546377459ef75cf54abeef5b969b5cf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Aug 2010 15:14:24 +0100 Subject: Major layout change to the packages directory Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie --- meta/packages/telepathy/empathy/no-gnome-doc.patch | 39 --------------------- meta/packages/telepathy/empathy_2.26.1.bb | 25 -------------- .../telepathy/libtelepathy/doublefix.patch | 16 --------- .../telepathy/libtelepathy/prefer_python_2.5.patch | 13 ------- meta/packages/telepathy/libtelepathy_0.3.3.bb | 14 -------- .../packages/telepathy/telepathy-farsight_0.0.7.bb | 16 --------- .../telepathy/telepathy-gabble/gabble.manager | 33 ------------------ meta/packages/telepathy/telepathy-gabble_0.7.8.bb | 17 --------- meta/packages/telepathy/telepathy-glib_0.9.2.bb | 12 ------- meta/packages/telepathy/telepathy-idle_0.1.2.bb | 11 ------ .../telepathy-mission-control/pkgconfig.patch | 24 ------------- .../telepathy/telepathy-mission-control_4.67.bb | 40 ---------------------- meta/packages/telepathy/telepathy-python_0.15.1.bb | 8 ----- 13 files changed, 268 deletions(-) delete mode 100644 meta/packages/telepathy/empathy/no-gnome-doc.patch delete mode 100644 meta/packages/telepathy/empathy_2.26.1.bb delete mode 100644 meta/packages/telepathy/libtelepathy/doublefix.patch delete mode 100644 meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch delete mode 100644 meta/packages/telepathy/libtelepathy_0.3.3.bb delete mode 100644 meta/packages/telepathy/telepathy-farsight_0.0.7.bb delete mode 100644 meta/packages/telepathy/telepathy-gabble/gabble.manager delete mode 100644 meta/packages/telepathy/telepathy-gabble_0.7.8.bb delete mode 100644 meta/packages/telepathy/telepathy-glib_0.9.2.bb delete mode 100644 meta/packages/telepathy/telepathy-idle_0.1.2.bb delete mode 100644 meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch delete mode 100644 meta/packages/telepathy/telepathy-mission-control_4.67.bb delete mode 100644 meta/packages/telepathy/telepathy-python_0.15.1.bb (limited to 'meta/packages/telepathy') diff --git a/meta/packages/telepathy/empathy/no-gnome-doc.patch b/meta/packages/telepathy/empathy/no-gnome-doc.patch deleted file mode 100644 index 13e7943da5..0000000000 --- a/meta/packages/telepathy/empathy/no-gnome-doc.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- - Makefile.am | 2 +- - configure.ac | 1 - - help/Makefile.am | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) - ---- empathy-0.23.4.orig/Makefile.am -+++ empathy-0.23.4/Makefile.am -@@ -1,6 +1,6 @@ --SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help -+SUBDIRS = tools extensions po data libempathy libempathy-gtk src - - if HAVE_MEGAPHONE - SUBDIRS += megaphone - endif - ---- empathy-0.23.4.orig/configure.ac -+++ empathy-0.23.4/configure.ac -@@ -55,11 +55,10 @@ AM_PROG_LIBTOOL - AM_PROG_MKDIR_P - AM_PATH_GLIB_2_0 - AC_PATH_XTRA - IT_PROG_INTLTOOL([0.35.0]) - GTK_DOC_CHECK([1.3]) --GNOME_DOC_INIT - IDT_COMPILE_WARNINGS - AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) - AC_PATH_PROG(GCONFTOOL, gconftool-2) - AM_GCONF_SOURCE_2 - GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` ---- empathy-0.23.4.orig/help/Makefile.am -+++ empathy-0.23.4/help/Makefile.am -@@ -1,6 +1,5 @@ --include $(top_srcdir)/gnome-doc-utils.make - - DOC_MODULE = empathy - DOC_ENTITIES = legal.xml - DOC_FIGURES = \ - figures/empathy-main-window.png \ diff --git a/meta/packages/telepathy/empathy_2.26.1.bb b/meta/packages/telepathy/empathy_2.26.1.bb deleted file mode 100644 index fe506faf14..0000000000 --- a/meta/packages/telepathy/empathy_2.26.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -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" -PR = "r2" - -inherit gnome - -PARALLEL_MAKE = "" - -EXTRA_OECONF += "--disable-scrollkeeper" - -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/libtelepathy/doublefix.patch b/meta/packages/telepathy/libtelepathy/doublefix.patch deleted file mode 100644 index 5ff1c436da..0000000000 --- a/meta/packages/telepathy/libtelepathy/doublefix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix double reference to this file to work with recent autoconf+automake - -RP 1/2/10 - -Index: libtelepathy-0.3.3/src/Makefile.am -=================================================================== ---- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000 -+++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000 -@@ -27,7 +27,6 @@ - tp-chan-type-text-gen.h \ - tp-chan-type-tubes-gen.h \ - tp-conn-iface-aliasing-gen.h \ -- tp-conn-iface-avatars-gen.h \ - tp-conn-iface-capabilities-gen.h \ - tp-conn-iface-contact-info-gen.h \ - tp-conn-iface-forwarding-gen.h \ diff --git a/meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch b/meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch deleted file mode 100644 index ec01567581..0000000000 --- a/meta/packages/telepathy/libtelepathy/prefer_python_2.5.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libtelepathy-0.3.1/configure.ac -=================================================================== ---- libtelepathy-0.3.1.orig/configure.ac 2007-11-22 19:05:56.000000000 +0000 -+++ libtelepathy-0.3.1/configure.ac 2008-01-04 12:07:28.000000000 +0000 -@@ -51,7 +51,7 @@ - AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) - fi - --AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python]) -+AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python]) - if test -z "$PYTHON"; then - AC_MSG_ERROR([Python is required to compile this package]) - fi diff --git a/meta/packages/telepathy/libtelepathy_0.3.3.bb b/meta/packages/telepathy/libtelepathy_0.3.3.bb deleted file mode 100644 index c1e0c76bdf..0000000000 --- a/meta/packages/telepathy/libtelepathy_0.3.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Telepathy framework - GLib library" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib" -LICENSE = "LGPL" -PR = "r3" - -SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ - file://prefer_python_2.5.patch;patch=1 \ - file://doublefix.patch;patch=1" - -inherit autotools pkgconfig - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/packages/telepathy/telepathy-farsight_0.0.7.bb b/meta/packages/telepathy/telepathy-farsight_0.0.7.bb deleted file mode 100644 index dfb7e39b0a..0000000000 --- a/meta/packages/telepathy/telepathy-farsight_0.0.7.bb +++ /dev/null @@ -1,16 +0,0 @@ -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 - -EXTRA_OECONF = "--disable-python" - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/packages/telepathy/telepathy-gabble/gabble.manager b/meta/packages/telepathy/telepathy-gabble/gabble.manager deleted file mode 100644 index 9000cd41cc..0000000000 --- a/meta/packages/telepathy/telepathy-gabble/gabble.manager +++ /dev/null @@ -1,33 +0,0 @@ - -[ConnectionManager] -BusName=org.freedesktop.Telepathy.ConnectionManager.gabble -ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble - -[Protocol jabber] -param-account=s required register -param-password=s required register -param-server=s -param-resource=s -param-priority=n -param-port=q -param-old-ssl=b -param-register=b -param-low-bandwidth=b -param-https-proxy-server=s -param-https-proxy-port=q -param-fallback-conference-server=s -param-stun-server=s -param-stun-port=q -param-ignore-ssl-errors=b -param-alias=s -param-mac=s -param-btid=s -default-resource=Telepathy -default-priority=0 -default-port=5222 -default-old-ssl=false -default-register=false -default-low-bandwidth=false -default-https-proxy-port=443 -default-stun-port=3478 -default-ignore-ssl-errors=false diff --git a/meta/packages/telepathy/telepathy-gabble_0.7.8.bb b/meta/packages/telepathy/telepathy-gabble_0.7.8.bb deleted file mode 100644 index 84eed373f7..0000000000 --- a/meta/packages/telepathy/telepathy-gabble_0.7.8.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Jabber/XMPP connection manager" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib" -LICENSE = "LGPL" - -# gabble.manager needs to get regenerated every release, so please don't copy it over blindly -SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \ - file://gabble.manager" - -inherit autotools pkgconfig - -do_compile_prepend() { - cp ${WORKDIR}/gabble.manager ${S}/data/ -} - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/packages/telepathy/telepathy-glib_0.9.2.bb b/meta/packages/telepathy/telepathy-glib_0.9.2.bb deleted file mode 100644 index 5c773bdb2d..0000000000 --- a/meta/packages/telepathy/telepathy-glib_0.9.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib gettext" -LICENSE = "LGPL" -PR = "r1" - -SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz" - -inherit autotools pkgconfig - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/packages/telepathy/telepathy-idle_0.1.2.bb b/meta/packages/telepathy/telepathy-idle_0.1.2.bb deleted file mode 100644 index d152e31a21..0000000000 --- a/meta/packages/telepathy/telepathy-idle_0.1.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "IRC connection manager for Telepathy" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus telepathy-glib openssl" -LICENSE = "LGPL" - -SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" - -inherit autotools pkgconfig - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch b/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch deleted file mode 100644 index 08a53d9e46..0000000000 --- a/meta/packages/telepathy/telepathy-mission-control/pkgconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: telepathy-mission-control-4.67/libmissioncontrol.pc.in -=================================================================== ---- 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.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.67.bb b/meta/packages/telepathy/telepathy-mission-control_4.67.bb deleted file mode 100644 index 3af177970e..0000000000 --- a/meta/packages/telepathy/telepathy-mission-control_4.67.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Central control for Telepathy connection managers" -HOMEPAGE = "http://mission-control.sourceforge.net/" -LICENSE = "LGPL" -SECTION = "libs" -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 pkgconfig - -PACKAGES =+ " \ - libmissioncontrol \ - libmissioncontrol-config \ - libmissioncontrol-server \ - libmissioncontrol-dev \ - libmissioncontrol-config-dev \ - libmissioncontrol-server-dev \ - libmissioncontrol-dbg \ - libmissioncontrol-config-dbg \ - libmissioncontrol-server-dbg \ -" - -FILES_${PN} += "${datadir}/dbus*" - -FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*" -FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*" -FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*" - -FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \ - ${includedir}/libmissioncontrol/ \ - ${libdir}/pkgconfig/libmissioncontrol.pc" -FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*" -FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*" - -FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*" -FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*" -FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*" diff --git a/meta/packages/telepathy/telepathy-python_0.15.1.bb b/meta/packages/telepathy/telepathy-python_0.15.1.bb deleted file mode 100644 index 0898b321eb..0000000000 --- a/meta/packages/telepathy/telepathy-python_0.15.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -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 -- cgit v1.2.3-54-g00ecf