merge of fb384f800bdb59aeed9d7bff06f6fa477bb6ddd6

     and dbb4f8c5ce9d6875e4b652532e08c39932325b64

61 files changed, 811 insertions, 68074 deletions

diff --git a/packages/dbus/dbus-0.61/dbus-1.init b/packages/dbus/dbus-0.61/dbus-1.init
deleted file mode 100644
index 60440b7223..0000000000
--- a/packages/dbus/dbus-0.61/dbus-1.init
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# -*- coding: utf-8 -*-
-# Debian init.d script for D-BUS
-# Copyright © 2003 Colin Walters <walters@debian.org>
-
-set -e
-
-DAEMON=/usr/bin/dbus-daemon
-NAME=dbus-1
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
-DESC="system message bus"
-EVENTDIR=/etc/dbus-1/event.d
-
-test -x $DAEMON || exit 0
-
-# Source defaults file; edit that file to configure this script.
-ENABLED=1
-PARAMS=""
-if [ -e /etc/default/dbus-1 ]; then
-  . /etc/default/dbus-1
-fi
-
-test "$ENABLED" != "0" || exit 0
-
-start_it_up()
-{
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
-  fi
-  if [ -e $PIDFILE ]; then
-    PIDDIR=/proc/$(cat $PIDFILE)
-    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
-      echo "$DESC already started; not starting."
-    else
-      echo "Removing stale PID file $PIDFILE."
-      rm -f $PIDFILE
-    fi
-  fi
-  echo -n "Starting $DESC: "
-  start-stop-daemon --start --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  if [ -d $EVENTDIR ]; then
-      run-parts --arg=start $EVENTDIR
-  fi
-}
-
-shut_it_down()
-{
-  if [ -d $EVENTDIR ]; then
-      run-parts --reverse --arg=stop $EVENTDIR
-  fi
-  echo -n "Stopping $DESC: "
-  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER
-  # We no longer include these arguments so that start-stop-daemon
-  # can do its job even given that we may have been upgraded.
-  # We rely on the pidfile being sanely managed
-  # --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    start_it_up
-  ;;
-  stop)
-    shut_it_down
-  ;;
-  restart|force-reload)
-    shut_it_down
-    sleep 1
-    start_it_up
-  ;;
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
-    exit 1
-  ;;
-esac
-
-exit 0
diff --git a/packages/dbus/dbus-0.61/no-bindings.patch b/packages/dbus/dbus-0.61/no-bindings.patch
deleted file mode 100644
index ccfc3f88b2..0000000000
--- a/packages/dbus/dbus-0.61/no-bindings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dbus-0.50/tools/Makefile.am.orig	2005-09-07 10:05:38 +0200
-+++ dbus-0.50/tools/Makefile.am	2005-09-07 10:06:30 +0200
-@@ -6,9 +6,6 @@
- nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
- libdbus_glibdir = $(includedir)/dbus-1.0/dbus
- 
--dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT)
--	$(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
--
- BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
- 
- else
diff --git a/packages/dbus/dbus-0.61/no-introspect.patch b/packages/dbus/dbus-0.61/no-introspect.patch
deleted file mode 100644
index 1e43dd121b..0000000000
--- a/packages/dbus/dbus-0.61/no-introspect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- dbus-0.50/tools/Makefile.am.orig	2005-09-07 10:03:49 +0200
-+++ dbus-0.50/tools/Makefile.am	2005-09-07 10:04:28 +0200
-@@ -21,11 +21,6 @@
- GTK_TOOLS=
- endif
- 
--if HAVE_GLIB
--dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile
--	DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
--endif
--
- bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
- 
- dbus_send_SOURCES=				\
diff --git a/packages/dbus/dbus-0.60/.mtn2git_empty b/packages/dbus/dbus-0.6x/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-0.60/.mtn2git_empty
+++ b/packages/dbus/dbus-0.6x/.mtn2git_empty
diff --git a/packages/dbus/dbus-0.60/dbus-1.init b/packages/dbus/dbus-0.6x/dbus-1.init
index 60440b7223..60440b7223 100644
--- a/packages/dbus/dbus-0.60/dbus-1.init
+++ b/packages/dbus/dbus-0.6x/dbus-1.init
diff --git a/packages/dbus/dbus-0.60/no-bindings.patch b/packages/dbus/dbus-0.6x/no-bindings.patch
index ccfc3f88b2..ccfc3f88b2 100644
--- a/packages/dbus/dbus-0.60/no-bindings.patch
+++ b/packages/dbus/dbus-0.6x/no-bindings.patch
diff --git a/packages/dbus/dbus-0.60/no-introspect.patch b/packages/dbus/dbus-0.6x/no-introspect.patch
index 1e43dd121b..1e43dd121b 100644
--- a/packages/dbus/dbus-0.60/no-introspect.patch
+++ b/packages/dbus/dbus-0.6x/no-introspect.patch
diff --git a/packages/dbus/dbus-native_0.62.bb b/packages/dbus/dbus-native_0.62.bb
new file mode 100644
index 0000000000..c91231f6f9
--- /dev/null
+++ b/packages/dbus/dbus-native_0.62.bb
@@ -0,0 +1,17 @@
+include dbus_${PV}.inc
+
+SRC_URI_EXTRA=""
+
+inherit native
+
+S = "${WORKDIR}/dbus-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
+DEPENDS = "glib-2.0-native"
+
+do_stage() {
+	oe_runmake install
+	install -d ${STAGING_DATADIR}/dbus
+	install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
+	install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
+}
+
diff --git a/packages/dbus/dbus_0.60.bb b/packages/dbus/dbus_0.60.bb
index e827457371..f8e16815e7 100644
--- a/packages/dbus/dbus_0.60.bb
+++ b/packages/dbus/dbus_0.60.bb
@@ -1,6 +1,6 @@
 include dbus_${PV}.inc
 
-
+FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
diff --git a/packages/dbus/dbus_0.61.bb b/packages/dbus/dbus_0.61.bb
index e827457371..f8e16815e7 100644
--- a/packages/dbus/dbus_0.61.bb
+++ b/packages/dbus/dbus_0.61.bb
@@ -1,6 +1,6 @@
 include dbus_${PV}.inc
 
-
+FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
diff --git a/packages/dbus/dbus_0.62.bb b/packages/dbus/dbus_0.62.bb
new file mode 100644
index 0000000000..f8e16815e7
--- /dev/null
+++ b/packages/dbus/dbus_0.62.bb
@@ -0,0 +1,13 @@
+include dbus_${PV}.inc
+
+FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
+DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
+SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
+
+FILES_${PN} += "${bindir}/dbus-daemon"
+FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
+
+do_configure_prepend() {
+	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
+	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
+}
diff --git a/packages/dbus/dbus_0.62.inc b/packages/dbus/dbus_0.62.inc
new file mode 100644
index 0000000000..c1dcc0e4a3
--- /dev/null
+++ b/packages/dbus/dbus_0.62.inc
@@ -0,0 +1,64 @@
+SECTION = "base"
+PR = "r0"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl"
+
+SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
+	   file://tmpdir.patch;patch=1 \
+	   file://dbus-1.init \
+	   file://no-examples.patch;patch=1 \
+	   ${SRC_URI_EXTRA}"
+
+inherit autotools pkgconfig update-rc.d gettext
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
+		--disable-checks --disable-xml-docs --disable-doxygen-docs \
+		--with-xml=expat --without-x"
+
+
+do_stage () {
+	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+	oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
+
+	autotools_stage_includes
+
+	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+}
+
+python populate_packages_prepend () {
+	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+		bb.data.setVar('PKG_dbus', 'dbus-1', d)
+}
diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb
index 4237427d63..5d065ea36d 100644
--- a/packages/e17/entrance_0.9.0.007.bb
+++ b/packages/e17/entrance_0.9.0.007.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Entrance is the Enlightenment login manager"
 LICENSE = "MIT"
 # can also use pam and crypt
-DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common login-manager"
-RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes"
+DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager"
+RDEPENDS += "bash keylaunch xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes"
 HOMEPAGE = "http://www.enlightenment.org"
 PR = "r13"
 
diff --git a/packages/ezx/ezx-boot-usb-native_1877.bb b/packages/ezx/ezx-boot-usb-native_1877.bb
index 2630a6bab6..d908c6d1fc 100644
--- a/packages/ezx/ezx-boot-usb-native_1877.bb
+++ b/packages/ezx/ezx-boot-usb-native_1877.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 AUTHOR = "Harald Welte"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${PV}"
 S = "${WORKDIR}/boot_usb"
@@ -12,7 +12,7 @@ S = "${WORKDIR}/boot_usb"
 inherit native
 
 do_compile() {
-	${CC} ${CFLAGS} -lusb -o ezx-boot-usb boot_usb.c
+	${CC} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c
 }
 
 do_deploy() {
diff --git a/packages/gammu/gammu_1.06.00.bb b/packages/gammu/gammu_1.06.00.bb
deleted file mode 100644
index 2611050afb..0000000000
--- a/packages/gammu/gammu_1.06.00.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-DESCRIPTION = "GNU All Mobile Managment Utilities"
-SECTION = "console/network"
-DEPENDS = "bluez-libs"
-LICENSE = "GPL"
-HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
-AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
-PR = "r1"
-
-SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
-
-EXTRA_OECONF = "--disable-mysql"
-
-inherit autotools pkgconfig
-
-do_compile () {
-        oe_runmake shared
-}
-
-# FIXME instead of ripping the complete autotools_stage_all, just because
-# FIXME gammu needs an additional install target (installshared), it might
-# FIXME be more appropriate to a) make the install target in autotools_stage_all
-# FIXME customizable or b) alter gammu makefall to make 'install' depend on 'installshared'. :M:
-do_stage() {
-        rm -rf ${STAGE_TEMP}
-        mkdir -p ${STAGE_TEMP}
-        oe_runmake DESTDIR="${STAGE_TEMP}" install
-	oe_runmake DESTDIR="${STAGE_TEMP}" installshared
-        if [ -d ${STAGE_TEMP}/${includedir} ]; then
-                cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-        fi
-        if [ -d ${STAGE_TEMP}/${libdir} ]
-        then
-                for i in ${STAGE_TEMP}/${libdir}/*.la
-                do
-                        if [ ! -f "$i" ]; then
-                                cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
-                                break
-                        fi
-                        oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR}
-                done
-        fi
-        if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
-                install -d ${STAGING_DATADIR}/aclocal
-                cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
-        fi
-        rm -rf ${STAGE_TEMP}
-}
-
-do_install () {
-        oe_runmake 'DESTDIR=${D}' installshared
-}
-
-PACKAGES =+ "libgammu"
-
-FILES_${PN} = "${bindir}/gammu"
-FILES_libgammu = "${libdir}/libGammu.so*"
-
-PACKAGES_DYNAMIC = "gammu-locale-*"
-
-python populate_packages_prepend () {
-        help_dir = bb.data.expand('${datadir}/gammu/', d)
-        
-        do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
-}
diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.07.00.bb
new file mode 100644
index 0000000000..514819935c
--- /dev/null
+++ b/packages/gammu/gammu_1.07.00.bb
@@ -0,0 +1,76 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+SECTION = "console/network"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
+AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+
+SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
+
+EXTRA_OECONF = "--disable-mysql"
+
+inherit autotools
+
+do_compile () {
+        oe_runmake shared
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
+                   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
+                   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
+                   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \
+                   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
+                   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
+                   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
+                   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
+                   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
+                   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
+                   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
+                   ${STAGING_INCDIR}/gammu/protocol/alcatel
+
+        oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
+
+        install -m 0644 common/*.h                      ${STAGING_INCDIR}/gammu/
+        install -m 0644 common/misc/*.h                 ${STAGING_INCDIR}/gammu/misc 
+        install -m 0644 common/misc/coding/*.h          ${STAGING_INCDIR}/gammu/misc/coding 
+        install -m 0644 common/phone/*.h                ${STAGING_INCDIR}/gammu/phone 
+        install -m 0644 common/phone/at/*.h             ${STAGING_INCDIR}/gammu/phone/at 
+        install -m 0644 common/phone/obex/*.h           ${STAGING_INCDIR}/gammu/phone/obex 
+        install -m 0644 common/phone/nokia/*.h          ${STAGING_INCDIR}/gammu/phone/nokia 
+        install -m 0644 common/phone/nokia/dct3/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct3 
+        install -m 0644 common/phone/nokia/dct4tiku/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku
+        install -m 0644 common/phone/symbian/*.h        ${STAGING_INCDIR}/gammu/phone/symbian 
+        install -m 0644 common/phone/alcatel/*.h        ${STAGING_INCDIR}/gammu/phone/alcatel 
+        install -m 0644 common/service/*.h              ${STAGING_INCDIR}/gammu/service 
+        install -m 0644 common/service/sms/*.h          ${STAGING_INCDIR}/gammu/service/sms 
+        install -m 0644 common/service/backup/*.h       ${STAGING_INCDIR}/gammu/service/backup 
+        install -m 0644 common/device/*.h               ${STAGING_INCDIR}/gammu/device 
+        install -m 0644 common/device/irda/*.h          ${STAGING_INCDIR}/gammu/device/irda 
+        install -m 0644 common/device/bluetoth/*.h      ${STAGING_INCDIR}/gammu/device/bluetoth 
+        install -m 0644 common/device/serial/*.h        ${STAGING_INCDIR}/gammu/device/serial 
+        install -m 0644 common/protocol/*.h             ${STAGING_INCDIR}/gammu/protocol 
+        install -m 0644 common/protocol/at/*.h          ${STAGING_INCDIR}/gammu/protocol/at 
+        install -m 0644 common/protocol/obex/*.h        ${STAGING_INCDIR}/gammu/protocol/obex 
+        install -m 0644 common/protocol/nokia/*.h       ${STAGING_INCDIR}/gammu/protocol/nokia 
+        install -m 0644 common/protocol/symbian/*.h     ${STAGING_INCDIR}/gammu/protocol/symbian 
+        install -m 0644 common/protocol/alcatel/*.h     ${STAGING_INCDIR}/gammu/protocol/alcatel
+}
+
+do_install () {
+        oe_runmake 'DESTDIR=${D}' installshared
+}
+
+PACKAGES =+ "libgammu"
+
+FILES_${PN} = "${bindir}/gammu"
+FILES_libgammu = "${libdir}/libGammu.so*"
+
+PACKAGES_DYNAMIC = "gammu-locale-*"
+
+python populate_packages_prepend () {
+        help_dir = bb.data.expand('${datadir}/gammu/', d)
+        
+        do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
+}
diff --git a/packages/libtool/libtool-1.5.6/autotools.patch b/packages/libtool/libtool-1.5.6/autotools.patch
deleted file mode 100644
index 5df441e945..0000000000
--- a/packages/libtool/libtool-1.5.6/autotools.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -urNd -urNd libtool-1.5/cdemo/configure.ac libtool-1.5.ac/cdemo/configure.ac
---- libtool-1.5/cdemo/configure.ac	2001-10-06 11:35:17.000000000 -0400
-+++ libtool-1.5.ac/cdemo/configure.ac	2004-05-05 17:16:17.000000000 -0400
-@@ -24,6 +