summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth-0.36.3/segfault.patch30
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth-0.37/.mtn2git_empty0
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch12
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch47
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth-0.37/hciattach-path.patch11
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch43
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb15
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.37.bb17
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.38.bb13
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.43.bb15
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.44.bb15
-rw-r--r--packages/gpe-bluetooth/gpe-bluetooth_0.51.bb14
-rw-r--r--packages/gpe-calendar/gpe-calendar-0.61/.mtn2git_empty0
-rw-r--r--packages/gpe-calendar/gpe-calendar-0.61/remove-render.patch10
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.56.bb9
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.58.bb10
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.59.bb10
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.61.bb11
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.63.bb10
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.64.bb10
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.65.bb11
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.70.bb12
-rw-r--r--packages/libao/libao-alsa_0.8.6.bb27
-rw-r--r--packages/libeventdb/libeventdb_0.15.bb24
-rw-r--r--packages/libeventdb/libeventdb_0.19.bb15
-rw-r--r--packages/libgpewidget/files/.mtn2git_empty (renamed from packages/gpe-bluetooth/gpe-bluetooth-0.36.3/.mtn2git_empty)0
-rw-r--r--packages/libgpewidget/files/pkgconfig.patch11
-rw-r--r--packages/libgpewidget/libgpewidget-0.100/.mtn2git_empty0
-rw-r--r--packages/libgpewidget/libgpewidget-0.100/fixdoc.patch10
-rw-r--r--packages/libgpewidget/libgpewidget-0.99/.mtn2git_empty0
-rw-r--r--packages/libgpewidget/libgpewidget-0.99/doc.patch15
-rw-r--r--packages/libgpewidget/libgpewidget_0.100.bb21
-rw-r--r--packages/libgpewidget/libgpewidget_0.109.bb27
-rw-r--r--packages/libgpewidget/libgpewidget_0.95.bb25
-rw-r--r--packages/libgpewidget/libgpewidget_0.96.bb25
-rw-r--r--packages/libgpewidget/libgpewidget_0.97.bb25
-rw-r--r--packages/libgpewidget/libgpewidget_0.99.bb20
-rw-r--r--packages/musicpd/mpd-alsa_0.11.5.bb32
38 files changed, 138 insertions, 464 deletions
diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/segfault.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/segfault.patch
deleted file mode 100644
index d18cb38aac..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/segfault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /cvs/gpe/base/gpe-bluetooth/main.c,v
-retrieving revision 1.51
-retrieving revision 1.52
-diff -u -r1.51 -r1.52
---- main.c 7 Mar 2004 17:41:27 -0000 1.51
-+++ main.c 7 Sep 2004 00:01:17 -0000 1.52
-@@ -508,7 +508,7 @@
- {
- GtkWidget *window;
- GdkBitmap *bitmap;
-- GtkWidget *menu_remove, *menu_file;
-+ GtkWidget *menu_remove;
- GtkTooltips *tooltips;
- int dd;
-
-@@ -560,12 +560,10 @@
-
- gtk_widget_show (menu_devices);
- gtk_widget_show (menu_remove);
-- gtk_widget_show (menu_file);
-
- gtk_menu_append (GTK_MENU (menu), menu_radio_on);
- gtk_menu_append (GTK_MENU (menu), menu_radio_off);
- gtk_menu_append (GTK_MENU (menu), menu_devices);
-- gtk_menu_append (GTK_MENU (menu), menu_file);
- gtk_menu_append (GTK_MENU (menu), menu_remove);
-
- if (gpe_load_icons (my_icons) == FALSE)
diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/.mtn2git_empty b/packages/gpe-bluetooth/gpe-bluetooth-0.37/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch
deleted file mode 100644
index 009b9a576f..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNd ../gpe-bluetooth-0.37-r0/gpe-bluetooth-0.37/Makefile gpe-bluetooth-0.37/Makefile
---- ../gpe-bluetooth-0.37-r0/gpe-bluetooth-0.37/Makefile 2004-09-07 01:01:06.000000000 +0100
-+++ gpe-bluetooth-0.37/Makefile 2004-10-18 11:55:53.000000000 +0100
-@@ -20,7 +20,7 @@
- PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS) `pkg-config --cflags dbus-glib-1` `pkg-config --cflags libglade-2.0` `pkg-config --cflags mimedir-1.0` `$(LIBGPEVTYPE_PC_EXTRA) pkg-config --cflags $(LIBGPEVTYPE_PC)`
- PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE -DGPE_BLUETOOTH
- PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
--PACKAGE_LDFLAGS += $(GPELIBS) -lbluetooth -lsdp `pkg-config --libs gthread-2.0` `pkg-config --libs dbus-glib-1` `pkg-config --libs libglade-2.0` -lopenobex `pkg-config --libs mimedir-1.0` `$(LIBGPEVTYPE_PC_EXTRA) pkg-config --libs $(LIBGPEVTYPE_PC)` -lsqlite
-+PACKAGE_LDFLAGS += $(GPELIBS) -lbluetooth -lbluetooth `pkg-config --libs gthread-2.0` `pkg-config --libs dbus-glib-1` `pkg-config --libs libglade-2.0` -lopenobex `pkg-config --libs mimedir-1.0` `$(LIBGPEVTYPE_PC_EXTRA) pkg-config --libs $(LIBGPEVTYPE_PC)` -lsqlite
-
- ifeq ($(CVSBUILD),yes)
- BUILD = ../build
diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch
deleted file mode 100644
index b7dc93b4e8..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: dbus.c
-===================================================================
-RCS file: /cvs/gpe/base/gpe-bluetooth/dbus.c,v
-retrieving revision 1.7
-diff -u -r1.7 dbus.c
---- gpe-bluetooth/dbus.c 7 Sep 2004 00:01:27 -0000 1.7
-+++ gpe-bluetooth/dbus.c 9 Jan 2005 13:56:46 -0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2002, 2003, 2004 Philip Blundell <philb@gnu.org>
-+ * Copyright (C) 2002, 2003, 2004, 2005 Philip Blundell <philb@gnu.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
-@@ -27,9 +27,11 @@
-
- #define _(x) gettext(x)
-
--#define SERVICE_NAME "org.handhelds.gpe.bluez"
--#define PIN_INTERFACE_NAME SERVICE_NAME ".PinAgent"
--#define OBEX_INTERFACE_NAME SERVICE_NAME ".OBEX"
-+#define PIN_SERVICE_NAME "org.bluez.PinAgent"
-+#define PIN_INTERFACE_NAME PIN_SERVICE_NAME
-+
-+#define OBEX_SERVICE_NAME "org.handhelds.gpe.bluez"
-+#define OBEX_INTERFACE_NAME OBEX_SERVICE_NAME ".OBEX"
-
- extern DBusHandlerResult bluez_pin_handle_dbus_request (DBusConnection *connection, DBusMessage *message);
- extern DBusHandlerResult obex_client_handle_dbus_request (DBusConnection *connection, DBusMessage *message);
-@@ -96,7 +98,7 @@
-
- dbus_connection_register_object_path (connection, object_path1, &dbus_pin_vtable, NULL);
-
-- dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error);
-+ dbus_bus_acquire_service (connection, PIN_SERVICE_NAME, 0, &error);
- if (dbus_error_is_set (&error))
- {
- gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message);
-@@ -118,7 +120,7 @@
-
- dbus_connection_register_object_path (connection, object_path2, &dbus_obex_vtable, NULL);
-
-- dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error);
-+ dbus_bus_acquire_service (connection, OBEX_SERVICE_NAME, 0, &error);
- if (dbus_error_is_set (&error))
- {
- gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message);
diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/hciattach-path.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/hciattach-path.patch
deleted file mode 100644
index 4b122668a6..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/hciattach-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-bluetooth-0.37/hciattach.sh.old 2004-11-23 14:11:16.000000000 +0000
-+++ gpe-bluetooth-0.37/hciattach.sh 2004-11-23 14:11:23.000000000 +0000
-@@ -3,7 +3,7 @@
- if [ -f /etc/sysconfig/bluetooth ]; then
- . /etc/sysconfig/bluetooth
-
-- exec hciattach -n $BLUETOOTH_PORT $BLUETOOTH_PROTOCOL $BLUETOOTH_SPEED
-+ exec /sbin/hciattach -n $BLUETOOTH_PORT $BLUETOOTH_PROTOCOL $BLUETOOTH_SPEED
- else
- echo "Bluetooth not configured"
- exit 1
diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch
deleted file mode 100644
index 2580d9c3c8..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -u -r1.52 main.c
---- gpe-bluetooth/main.c 7 Sep 2004 00:01:17 -0000 1.52
-+++ gpe-bluetooth/main.c 19 Oct 2004 08:16:27 -0000
-@@ -503,6 +503,22 @@
- g_timeout_add (time, (GSourceFunc) cancel_dock_message, (gpointer)id);
- }
-
-+gboolean
-+configure_event (GtkWidget *window, GdkEventConfigure *event, GdkBitmap *bitmap)
-+{
-+ GdkPixbuf *buf;
-+ int xoff, yoff;
-+
-+ buf = gpe_find_icon ("bt-off");
-+
-+ xoff = (event->width - gdk_pixbuf_get_width (buf)) / 2;
-+ yoff = (event->height - gdk_pixbuf_get_height (buf)) / 2;
-+
-+ gtk_widget_shape_combine_mask (window, bitmap, xoff, yoff);
-+
-+ return FALSE;
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -572,14 +588,14 @@
- icon = gtk_image_new_from_pixbuf (gpe_find_icon (radio_is_on ? "bt-on" : "bt-off"));
- gtk_widget_show (icon);
- gdk_pixbuf_render_pixmap_and_mask (gpe_find_icon ("bt-off"), NULL, &bitmap, 255);
-- gtk_widget_shape_combine_mask (window, bitmap, 2, 0);
-- gdk_bitmap_unref (bitmap);
-+ gtk_widget_shape_combine_mask (window, bitmap, 0, 0);
-
- gpe_set_window_icon (window, "bt-on");
-
- tooltips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), window, _("This is the Bluetooth control.\nTap here to turn the radio on and off, or to see a list of Bluetooth devices."), NULL);
-
-+ g_signal_connect (G_OBJECT (window), "configure-event", G_CALLBACK (configure_event), bitmap);
- g_signal_connect (G_OBJECT (window), "button-press-event", G_CALLBACK (clicked), NULL);
- gtk_widget_add_events (window, GDK_BUTTON_PRESS_MASK);
-
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb
deleted file mode 100644
index 763f9a739f..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe"
-RDEPENDS = "bluez-utils blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r3"
-
-SRC_URI += "file://segfault.patch;patch=1;pnum=0"
-
-FILES_${PN} += '${datadir}/bluez-pin'
-
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb
deleted file mode 100644
index 5c7581e224..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r7"
-
-FILES_${PN} += '${datadir}/bluez-pin'
-
-SRC_URI += "file://change-sdp-to-bluetooth.patch;patch=1 \
- file://icon-resize.patch;patch=1 \
- file://hciattach-path.patch;patch=1 \
- file://dbus-service-name.patch;patch=1"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.38.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.38.bb
deleted file mode 100644
index 80076dab01..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.38.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-FILES_${PN} += '${datadir}/bluez-pin'
-
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.43.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.43.bb
deleted file mode 100644
index 6a4e6dc907..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.43.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += '${datadir}/bluez-pin'
-
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.44.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.44.bb
deleted file mode 100644
index 6a4e6dc907..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.44.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += '${datadir}/bluez-pin'
-
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
new file mode 100644
index 0000000000..12833d7dde
--- /dev/null
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb
@@ -0,0 +1,14 @@
+LICENSE = "GPL"
+DESCRIPTION = "GPE bluetooth support user interface tool."
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
+RDEPENDS = "bluez-utils-dbus blueprobe"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpe autotools
+
+FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-calendar/gpe-calendar-0.61/.mtn2git_empty b/packages/gpe-calendar/gpe-calendar-0.61/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-calendar/gpe-calendar-0.61/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-calendar/gpe-calendar-0.61/remove-render.patch b/packages/gpe-calendar/gpe-calendar-0.61/remove-render.patch
deleted file mode 100644
index 70353e8186..0000000000
--- a/packages/gpe-calendar/gpe-calendar-0.61/remove-render.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../gpe-calendar-0.61-r0/gpe-calendar-0.61/main.c 2005-01-09 13:59:38.000000000 +0100
-+++ gpe-calendar-0.61/main.c 2005-04-20 21:26:48.686200320 +0200
-@@ -22,7 +22,6 @@
-
- #include <gpe/init.h>
- #include <gpe/pixmaps.h>
--#include <gpe/render.h>
- #include <gpe/errorbox.h>
-
- #include <gpe/event-db.h>
diff --git a/packages/gpe-calendar/gpe-calendar_0.56.bb b/packages/gpe-calendar/gpe-calendar_0.56.bb
deleted file mode 100644
index 9e2f03c31d..0000000000
--- a/packages/gpe-calendar/gpe-calendar_0.56.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE calendar"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
diff --git a/packages/gpe-calendar/gpe-calendar_0.58.bb b/packages/gpe-calendar/gpe-calendar_0.58.bb
deleted file mode 100644
index ff7fc617fc..0000000000
--- a/packages/gpe-calendar/gpe-calendar_0.58.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe
-
-DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE calendar"
-
diff --git a/packages/gpe-calendar/gpe-calendar_0.59.bb b/packages/gpe-calendar/gpe-calendar_0.59.bb
deleted file mode 100644
index ff7fc617fc..0000000000
--- a/packages/gpe-calendar/gpe-calendar_0.59.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe
-
-DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE calendar"
-
diff --git a/packages/gpe-calendar/gpe-calendar_0.61.bb b/packages/gpe-calendar/gpe-calendar_0.61.bb
deleted file mode 100644
index eb387e5d87..0000000000
--- a/packages/gpe-calendar/gpe-calendar_0.61.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-LICENSE = "GPL"
-PR = "r1"
-
-inherit gpe
-
-DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE calendar"
-
-SRC_URI += "file://remove-render.patch;patch=1"
diff --git a/packages/gpe-calendar/gpe-calendar_0.63.bb b/packages/gpe-calendar/gpe-calendar_0.63.bb
deleted file mode 100644
index 2a2530808b..0000000000
--- a/packages/gpe-calendar/gpe-calendar_0.63.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "GPL"
-PR = "r1"
-
-inherit autotools gpe
-
-DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE calendar"
-
diff --git a/packages/gpe-calendar/gpe-calendar_0.64.bb b/packages/gpe-calendar/gpe-calendar_0.64.bb
deleted file mode 100644
index 2a2530808b..0000000000
--- a/packages/gpe-calendar/gpe-calendar_0.64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "GPL"
-PR = "r1"
-
-inherit autotools gpe
-
-DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE calendar"
-
diff --git a/packages/gpe-calendar/gpe-calendar_0.65.bb b/packages/gpe-calendar/gpe-calendar_0.65.bb
deleted file mode 100644
index da50299bcd..0000000000
--- a/packages/gpe-calendar/gpe-calendar_0.65.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit autotools gpe
-
-DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE calendar"
-
diff --git a/packages/gpe-calendar/gpe-calendar_0.70.bb b/packages/gpe-calendar/gpe-calendar_0.70.bb
new file mode 100644
index 0000000000..43b5be25b4
--- /dev/null
+++ b/packages/gpe-calendar/gpe-calendar_0.70.bb
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+PR = "r0"
+GPE_TARBALL_SUFFIX = "bz2"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+inherit autotools gpe
+
+DEPENDS = "dbus libeventdb libschedule libxsettings-client libgpepimc libgpevtype"
+SECTION = "gpe"
+RDEPENDS = "gpe-icons"
+DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite."
+
diff --git a/packages/libao/libao-alsa_0.8.6.bb b/packages/libao/libao-alsa_0.8.6.bb
new file mode 100644
index 0000000000..4df98e1cca
--- /dev/null
+++ b/packages/libao/libao-alsa_0.8.6.bb
@@ -0,0 +1,27 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cross platform audio library. This is the ALSA plugin."
+HOMEPAGE = "http://www.xiph.org/ao/"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
+DEPENDS = "alsa-lib libao"
+RDEPENDS = "libao2 (>=${PV})"
+PR = "r1"
+
+SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
+S = "${WORKDIR}/libao-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-esd --disable-esdtest \
+ --disable-oss \
+ --enable-alsa09 --enable-alsa09-mmap \
+ --disable-arts --disable-nas"
+
+do_stage() {
+ oe_libinstall -so -C src libao ${STAGING_LIBDIR}
+}
+
+PACKAGES = "libao-alsa-plugin libao-alsa-plugin-dev"
+FILES_libao-alsa-plugin= "${libdir}/ao/plugins-2/libalsa*.so"
+FILES_libao-alsa-plugin-dev += "${libdir}/ao/plugins-2/libalsa*.la"
diff --git a/packages/libeventdb/libeventdb_0.15.bb b/packages/libeventdb/libeventdb_0.15.bb
deleted file mode 100644
index 9d3dcbe622..0000000000
--- a/packages/libeventdb/libeventdb_0.15.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Database access library for GPE calendar"
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "libgpewidget libgpepimc sqlite"
-
-inherit pkgconfig gpe
-
-headers = "event-db.h"
-
-do_stage () {
- oe_libinstall -so libeventdb ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/gpe
- for h in ${headers}; do
- install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
- done
-}
-
-do_install () {
- gpe_do_install
- oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
-}
diff --git a/packages/libeventdb/libeventdb_0.19.bb b/packages/libeventdb/libeventdb_0.19.bb
new file mode 100644
index 0000000000..30dc81c34c
--- /dev/null
+++ b/packages/libeventdb/libeventdb_0.19.bb
@@ -0,0 +1,15 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Database access library for GPE calendar"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "libgpewidget libgpepimc sqlite"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit pkgconfig gpe autotools
+
+
+do_stage () {
+autotools_stage_all
+}
diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/.mtn2git_empty b/packages/libgpewidget/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/.mtn2git_empty
+++ b/packages/libgpewidget/files/.mtn2git_empty
diff --git a/packages/libgpewidget/files/pkgconfig.patch b/packages/libgpewidget/files/pkgconfig.patch
new file mode 100644
index 0000000000..317e01a9b4
--- /dev/null
+++ b/packages/libgpewidget/files/pkgconfig.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2006-02-04 17:37:55.000000000 +0100
++++ configure.ac 2006-02-06 00:56:28.000000000 +0100
+@@ -36,7 +36,7 @@
+ ENABLE_CAIRO=$enableval
+ ],
+ [
+- PKG_CHECK_EXISTS(cairo, [ENABLE_CAIRO=yes], [ENABLE_CAIRO=no])
++ PKG_CHECK_MODULES(cairo, [ENABLE_CAIRO=yes], [ENABLE_CAIRO=no])
+ ])
+
+ ENABLE_HILDON=false
diff --git a/packages/libgpewidget/libgpewidget-0.100/.mtn2git_empty b/packages/libgpewidget/libgpewidget-0.100/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libgpewidget/libgpewidget-0.100/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libgpewidget/libgpewidget-0.100/fixdoc.patch b/packages/libgpewidget/libgpewidget-0.100/fixdoc.patch
deleted file mode 100644
index c5c83af303..0000000000
--- a/packages/libgpewidget/libgpewidget-0.100/fixdoc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /tmp/libgpewidget-0.100/doc/gtk-doc.make 2005-04-21 23:56:55.000000000 +0200
-+++ libgpewidget-0.100/doc/gtk-doc.make 2005-04-22 12:36:23.628751472 +0200
-@@ -27,7 +27,6 @@
- $(DOC_MAIN_SGML_FILE) \
- $(DOC_MODULE)-sections.txt \
- $(DOC_MODULE)-overrides.txt
--# $(DOC_MODULE).types \
-
- DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
diff --git a/packages/libgpewidget/libgpewidget-0.99/.mtn2git_empty b/packages/libgpewidget/libgpewidget-0.99/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libgpewidget/libgpewidget-0.99/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libgpewidget/libgpewidget-0.99/doc.patch b/packages/libgpewidget/libgpewidget-0.99/doc.patch
deleted file mode 100644
index 06b61049e3..0000000000
--- a/packages/libgpewidget/libgpewidget-0.99/doc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgpewidget-0.99/doc/Makefile.am.orig 2005-04-19 13:32:58.335718432 +0100
-+++ libgpewidget-0.99/doc/Makefile.am 2005-04-19 13:33:06.755438440 +0100
-@@ -26,12 +26,6 @@
- gtkdoc-mkdb --module=$(DOC_MODULE) $(MKDB_OPTIONS) --source-dir=../gpe --source-dir=.. --main-sgml-file=$(DOC_MAIN_SGML_FILE)
- gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE)
-
--else
--all: doc
--doc:
-- @echo "Use \"configure --enable-gtk-doc\" to enable documentation"
-- @exit 1
--
- endif
-
- clean-local:
diff --git a/packages/libgpewidget/libgpewidget_0.100.bb b/packages/libgpewidget/libgpewidget_0.100.bb
deleted file mode 100644
index 977577c469..0000000000
--- a/packages/libgpewidget/libgpewidget_0.100.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-LICENSE = "LGPL"
-PR = "r2"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS="gtk+ libxrender gtk-doc intltool-native"
-#DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
- file://fixdoc.patch;patch=1"
-
-inherit pkgconfig autotools
-
-#EXTRA_OECONF = "--enable-cairo"
-
-do_stage () {
- oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR}
- autotools_stage_includes
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.109.bb b/packages/libgpewidget/libgpewidget_0.109.bb
new file mode 100644
index 0000000000..bab62fd3dc
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.109.bb
@@ -0,0 +1,27 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR = "r1"
+
+PACKAGES =+ "libgpewidget-bin"
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
+ file://pkgconfig.patch;patch=1;pnum=0"
+
+inherit pkgconfig autotools
+
+FILES_libgpewidget-bin = "${bindir}"
+
+EXTRA_OECONF = "--enable-cairo"
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+ autotools_stage_all
+}
+
diff --git a/packages/libgpewidget/libgpewidget_0.95.bb b/packages/libgpewidget/libgpewidget_0.95.bb
deleted file mode 100644
index 0951beed01..0000000000
--- a/packages/libgpewidget/libgpewidget_0.95.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-PR = "r1"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender"
-
-inherit pkgconfig gpe
-
-headers = "infoprint.h init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h gpeiconlistview.h gpehelp.h gpeiconlistitem.h gpeclockface.h"
-
-do_stage () {
- oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/gpe
- for h in ${headers}; do
- install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
- done
-}
-
-do_install_append () {
- oe_runmake PREFIX='${prefix}' DESTDIR='${D}' install-devel
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.96.bb b/packages/libgpewidget/libgpewidget_0.96.bb
deleted file mode 100644
index 0951beed01..0000000000
--- a/packages/libgpewidget/libgpewidget_0.96.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-PR = "r1"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender"
-
-inherit pkgconfig gpe
-
-headers = "infoprint.h init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h gpeiconlistview.h gpehelp.h gpeiconlistitem.h gpeclockface.h"
-
-do_stage () {
- oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/gpe
- for h in ${headers}; do
- install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
- done
-}
-
-do_install_append () {
- oe_runmake PREFIX='${prefix}' DESTDIR='${D}' install-devel
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.97.bb b/packages/libgpewidget/libgpewidget_0.97.bb
deleted file mode 100644
index 0951beed01..0000000000
--- a/packages/libgpewidget/libgpewidget_0.97.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-PR = "r1"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender"
-
-inherit pkgconfig gpe
-
-headers = "infoprint.h init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h gpeiconlistview.h gpehelp.h gpeiconlistitem.h gpeclockface.h"
-
-do_stage () {
- oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
-
- mkdir -p ${STAGING_INCDIR}/gpe
- for h in ${headers}; do
- install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
- done
-}
-
-do_install_append () {
- oe_runmake PREFIX='${prefix}' DESTDIR='${D}' install-devel
-}
-
diff --git a/packages/libgpewidget/libgpewidget_0.99.bb b/packages/libgpewidget/libgpewidget_0.99.bb
deleted file mode 100644
index c932e67d76..0000000000
--- a/packages/libgpewidget/libgpewidget_0.99.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "LGPL"
-PR = "r0"
-DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
- file://doc.patch;patch=1"
-
-inherit pkgconfig autotools
-
-EXTRA_OECONF = "--enable-cairo"
-
-do_stage () {
- oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR}
- autotools_stage_includes
-}
-
diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb
new file mode 100644
index 0000000000..d4ee65abba
--- /dev/null
+++ b/packages/musicpd/mpd-alsa_0.11.5.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa support"
+HOMEPAGE = "http://www.musicpd.org"
+LICENSE = "GPLv2"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "console/multimedia"
+DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv"
+RDEPENDS = "libao-alsa"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
+ file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"
+S = "${WORKDIR}/mpd-${PV}"
+
+inherit autotools update-rc.d
+INITSCRIPT_NAME = "mpd"
+
+# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
+# be built, instead we use the OE built versions which should be installed
+# in staging - remove the --with and replace with --enable to use the local
+# versions.
+
+EXTRA_OECONF = "--enable-ogg \
+ --with-id3tag-libraries=${STAGING_LIBDIR} \
+ --with-id3tag-includes=${STAGING_INCDIR} \
+ --with-mad-libraries=${STAGING_LIBDIR} \
+ --with-mad-includes=${STAGING_INCDIR} \
+ --without-faad"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd
+}