From ff44a61a9b672aab9b86c2870b6972fbb040440b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 16 Jul 2008 04:49:21 +0000
Subject: Fix rsync source path.

---
 packages/rsync/rsync.inc      | 2 +-
 packages/rsync/rsync_2.6.9.bb | 2 +-
 packages/rsync/rsync_3.0.0.bb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/rsync/rsync.inc b/packages/rsync/rsync.inc
index 7ec83293ff..75f4c46303 100644
--- a/packages/rsync/rsync.inc
+++ b/packages/rsync/rsync.inc
@@ -7,7 +7,7 @@ DEPENDS += "popt"
 
 inherit autotools
 
-SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz"
+SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz"
 
 EXTRA_OEMAKE='STRIP=""'
 
diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb
index 067df4f2f3..77cb0b2b67 100644
--- a/packages/rsync/rsync_2.6.9.bb
+++ b/packages/rsync/rsync_2.6.9.bb
@@ -1,5 +1,5 @@
 require rsync.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://rsyncd.conf"
diff --git a/packages/rsync/rsync_3.0.0.bb b/packages/rsync/rsync_3.0.0.bb
index 99bec628d3..cd8a986f8f 100644
--- a/packages/rsync/rsync_3.0.0.bb
+++ b/packages/rsync/rsync_3.0.0.bb
@@ -1,6 +1,6 @@
 require rsync.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "\
   file://m4.patch;patch=1 \
-- 
cgit v1.2.3


From 1329a4624bfec8dc8dcf86c2a6e14125a32d9021 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 16 Jul 2008 07:40:40 +0000
Subject: python-evas cvs quickhack to make it work with newer pyrex

---
 packages/python/python-evas_cvs.bb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'packages')

diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb
index 92f4466a24..57e28b28ed 100644
--- a/packages/python/python-evas_cvs.bb
+++ b/packages/python/python-evas_cvs.bb
@@ -3,6 +3,10 @@ DEPENDS += "evas"
 PV = "0.2.1+cvs${SRCDATE}"
 PR = "r0"
 
+do_compile_prepend() {
+	touch include/evas/__init__.py
+}
+
 do_stage() {
 	distutils_stage_all
 }
-- 
cgit v1.2.3


From 74a560bfe000c60dedd513604cea372dbac6590a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 16 Jul 2008 07:51:03 +0000
Subject: python 2.5.2 add parameter to run python in unoptimized bytecode mode
 Thanks to the default-is-optimized patch, this python was running in
 optimized mode all the time, there was no way to run it unoptimized. However
 this is necessary at times (e.g. if you want to run code that contains
 'assert' statements, since optimized bytecode strips these out), so I added a
 new command line parameter 'N' to python that allows you to run it
 unoptimized.

---
 .../python/python-2.5.2/default-is-optimized.patch | 41 ++++++++++++++++++++--
 packages/python/python_2.5.2.bb                    |  2 +-
 2 files changed, 39 insertions(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/python/python-2.5.2/default-is-optimized.patch b/packages/python/python-2.5.2/default-is-optimized.patch
index 6beeb6e022..072bf0b059 100644
--- a/packages/python/python-2.5.2/default-is-optimized.patch
+++ b/packages/python/python-2.5.2/default-is-optimized.patch
@@ -1,7 +1,7 @@
-Index: Python-2.5.1/Python/compile.c
+Index: Python-2.5.2/Python/compile.c
 ===================================================================
---- Python-2.5.1.orig/Python/compile.c
-+++ Python-2.5.1/Python/compile.c
+--- Python-2.5.2.orig/Python/compile.c
++++ Python-2.5.2/Python/compile.c
 @@ -30,7 +30,7 @@
  #include "symtable.h"
  #include "opcode.h"
@@ -11,3 +11,38 @@ Index: Python-2.5.1/Python/compile.c
  
  /*
    ISSUES:
+Index: Python-2.5.2/Modules/main.c
+===================================================================
+--- Python-2.5.2.orig/Modules/main.c
++++ Python-2.5.2/Modules/main.c
+@@ -40,7 +40,7 @@ static char **orig_argv;
+ static int  orig_argc;
+ 
+ /* command line options */
+-#define BASE_OPTS "c:dEhim:OQ:StuUvVW:xX?"
++#define BASE_OPTS "c:dEhim:ONQ:StuUvVW:xX?"
+ 
+ #ifndef RISCOS
+ #define PROGRAM_OPTS BASE_OPTS
+@@ -68,8 +68,7 @@ Options and arguments (and corresponding
+ ";
+ static char *usage_2 = "\
+ -m mod : run library module as a script (terminates option list)\n\
+--O     : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\
+--OO    : remove doc-strings in addition to the -O optimizations\n\
++-N     : do NOT optimize generated bytecode\n\
+ -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
+ -S     : don't imply 'import site' on initialization\n\
+ -t     : issue warnings about inconsistent tab usage (-tt: issue errors)\n\
+@@ -302,7 +301,10 @@ Py_Main(int argc, char **argv)
+ 			break;
+ 
+ 		case 'O':
+-			Py_OptimizeFlag++;
++			fprintf(stderr, "-O is already default in this version. Ignoring\n");
++
++		case 'N':
++			Py_OptimizeFlag=0;
+ 			break;
+ 
+ 		case 'S':
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index 22aac7c9ee..9617871fff 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 # bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml4"
+PR = "ml6"
 
 PYTHON_MAJMIN = "2.5"
 
-- 
cgit v1.2.3


From 4a5149ccbb13a8425e672d4c1b82754456b747ed Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 16 Jul 2008 08:11:30 +0000
Subject: remove deprecated freesmartphone.org recipes

---
 .../freesmartphone/python-odeviced/.mtn2git_empty  |  0
 packages/freesmartphone/python-odeviced/odeviced   | 40 ----------------------
 .../freesmartphone/python-odeviced/odeviced.conf   |  0
 .../python-odeviced/om-gta02/.mtn2git_empty        |  0
 .../python-odeviced/om-gta02/odeviced.conf         |  8 -----
 packages/freesmartphone/python-odeviced_git.bb     | 35 -------------------
 .../freesmartphone/python-oeventd/.mtn2git_empty   |  0
 packages/freesmartphone/python-oeventd/oeventd     | 40 ----------------------
 packages/freesmartphone/python-oeventd_git.bb      | 34 ------------------
 .../freesmartphone/python-ophoned/.mtn2git_empty   |  0
 packages/freesmartphone/python-ophoned/ophoned     | 40 ----------------------
 packages/freesmartphone/python-ophoned_git.bb      | 35 -------------------
 .../freesmartphone/python-ousaged/.mtn2git_empty   |  0
 packages/freesmartphone/python-ousaged/ousaged     | 40 ----------------------
 packages/freesmartphone/python-ousaged_git.bb      | 36 -------------------
 15 files changed, 308 deletions(-)
 delete mode 100644 packages/freesmartphone/python-odeviced/.mtn2git_empty
 delete mode 100644 packages/freesmartphone/python-odeviced/odeviced
 delete mode 100644 packages/freesmartphone/python-odeviced/odeviced.conf
 delete mode 100644 packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty
 delete mode 100644 packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
 delete mode 100644 packages/freesmartphone/python-odeviced_git.bb
 delete mode 100644 packages/freesmartphone/python-oeventd/.mtn2git_empty
 delete mode 100644 packages/freesmartphone/python-oeventd/oeventd
 delete mode 100644 packages/freesmartphone/python-oeventd_git.bb
 delete mode 100644 packages/freesmartphone/python-ophoned/.mtn2git_empty
 delete mode 100644 packages/freesmartphone/python-ophoned/ophoned
 delete mode 100644 packages/freesmartphone/python-ophoned_git.bb
 delete mode 100644 packages/freesmartphone/python-ousaged/.mtn2git_empty
 delete mode 100644 packages/freesmartphone/python-ousaged/ousaged
 delete mode 100644 packages/freesmartphone/python-ousaged_git.bb

(limited to 'packages')

diff --git a/packages/freesmartphone/python-odeviced/.mtn2git_empty b/packages/freesmartphone/python-odeviced/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/freesmartphone/python-odeviced/odeviced b/packages/freesmartphone/python-odeviced/odeviced
deleted file mode 100644
index 52d3a1d196..0000000000
--- a/packages/freesmartphone/python-odeviced/odeviced
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# odeviced  This shell script starts and stops the open device daemon.
-#
-# chkconfig: 345 90 20
-# description: py-odeviced is the open device daemon
-# processname: python
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=odeviced
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-        echo -n "Starting open device daemon: "
-        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/odeviced
-        if [ $? = 0 ]; then
-            echo "(ok)"
-        else
-            echo "(failed)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping open device daemon: "
-        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
-        rm -f /var/run/${NAME}.pid
-        echo "(done)"
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/odeviced {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/freesmartphone/python-odeviced/odeviced.conf b/packages/freesmartphone/python-odeviced/odeviced.conf
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty b/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf b/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
deleted file mode 100644
index 0076639f98..0000000000
--- a/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[idlenotifier]
-# don't read from accellerometers for now
-ignoreinput=2,3
-
-[input]
-# don't read from accellerometers for now
-ignoreinput=2,3
-
diff --git a/packages/freesmartphone/python-odeviced_git.bb b/packages/freesmartphone/python-odeviced_git.bb
deleted file mode 100644
index 121a434585..0000000000
--- a/packages/freesmartphone/python-odeviced_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "The Open Device Daemon Prototype in Python"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenDeviceDaemon"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-SECTION = "console/network"
-DEPENDS = "python-cython-native python-pyrex-native"
-LICENSE = "GPLv2"
-PV = "0.7.9+gitr${SRCREV}"
-PR = "r2"
-
-inherit distutils update-rc.d
-
-INITSCRIPT_NAME = "odeviced"
-INITSCRIPT_PARAMS = "defaults 21"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/python-odeviced.git;protocol=git;branch=master \
-           file://odeviced \
-           file://odeviced.conf"
-S = "${WORKDIR}/git"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/odeviced ${D}${sysconfdir}/init.d/
-	install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir}
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/
-}
-
-RDEPENDS_${PN} += "\
-  python-dbus \
-  python-pygobject \
-  python-pyrtc \
-  python-syslog \
-"
-
-FILES_${PN} += "${sysconfdir}"
diff --git a/packages/freesmartphone/python-oeventd/.mtn2git_empty b/packages/freesmartphone/python-oeventd/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/freesmartphone/python-oeventd/oeventd b/packages/freesmartphone/python-oeventd/oeventd
deleted file mode 100644
index 8ed467b079..0000000000
--- a/packages/freesmartphone/python-oeventd/oeventd
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# odeviced  This shell script starts and stops the open event daemon.
-#
-# chkconfig: 345 90 20
-# description: py-oeventd is the open evend daemon
-# processname: python
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=oeventd
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-        echo -n "Starting open event daemon: "
-        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/oeventd
-        if [ $? = 0 ]; then
-            echo "(ok)"
-        else
-            echo "(failed)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping open event daemon: "
-        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
-        rm -f /var/run/${NAME}.pid
-        echo "(done)"
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/oeventd {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/freesmartphone/python-oeventd_git.bb b/packages/freesmartphone/python-oeventd_git.bb
deleted file mode 100644
index c08e1af3b7..0000000000
--- a/packages/freesmartphone/python-oeventd_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "The Open Event Daemon Prototype in Python"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenEventDaemon"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-SECTION = "console/network"
-DEPENDS = "python-cython-native python-pyrex-native"
-LICENSE = "GPLv2"
-PV = "0.0.0+gitr${SRCREV}"
-PR = "r1"
-
-inherit distutils update-rc.d
-
-INITSCRIPT_NAME = "oeventd"
-INITSCRIPT_PARAMS = "defaults 21"
-
-SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/eventd.git;protocol=git;branch=master \
-  file://oeventd \
-"
-S = "${WORKDIR}/git"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/oeventd ${D}${sysconfdir}/init.d/
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	mv -f ${D}${datadir}/etc/dbus-1/system.d/oeventd.conf ${D}${sysconfdir}/dbus-1/system.d/
-}
-
-RDEPENDS_${PN} += "\
-  python-dbus \
-  python-pygobject \
-  python-syslog \
-"
-
-FILES_${PN} += "${sysconfdir}"
diff --git a/packages/freesmartphone/python-ophoned/.mtn2git_empty b/packages/freesmartphone/python-ophoned/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/freesmartphone/python-ophoned/ophoned b/packages/freesmartphone/python-ophoned/ophoned
deleted file mode 100644
index edc800711a..0000000000
--- a/packages/freesmartphone/python-ophoned/ophoned
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# ophoned  This shell script starts and stops the open phone daemon.
-#
-# chkconfig: 345 90 20
-# description: py-ophoned is the open phone daemon
-# processname: python
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=ophoned
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-        echo -n "Starting open phone daemon: "
-        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ophoned
-        if [ $? = 0 ]; then
-            echo "(ok)"
-        else
-            echo "(failed)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping open phone daemon: "
-        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
-        rm -f /var/run/${NAME}.pid
-        echo "(done)"
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/ophoned {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/freesmartphone/python-ophoned_git.bb b/packages/freesmartphone/python-ophoned_git.bb
deleted file mode 100644
index 7f30f4c24a..0000000000
--- a/packages/freesmartphone/python-ophoned_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "The Open Phone Daemon (Python Implementation)"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenPhoneServer"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-SECTION = "console/network"
-DEPENDS = "python-cython-native python-pyrex-native"
-LICENSE = "GPLv2"
-PV = "0.0.0+gitr${SRCREV}"
-PR = "r1"
-
-inherit distutils update-rc.d
-
-INITSCRIPT_NAME = "ophoned"
-INITSCRIPT_PARAMS = "defaults 21"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/python-ophoned.git;protocol=git;branch=master \
-           file://ophoned"
-S = "${WORKDIR}/git"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/ophoned ${D}${sysconfdir}/init.d/
-#	install -m 0644 ${WORKDIR}/ophoned.conf ${D}${sysconfdir}
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	mv -f ${D}${datadir}/etc/dbus-1/system.d/ophoned.conf ${D}${sysconfdir}/dbus-1/system.d/
-}
-
-RDEPENDS_${PN} += "\
-  python-dbus \
-  python-pygobject \
-  python-pyrtc \
-  python-pyserial \
-  python-syslog \
-"
-
-FILES_${PN} += "${sysconfdir}"
diff --git a/packages/freesmartphone/python-ousaged/.mtn2git_empty b/packages/freesmartphone/python-ousaged/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/freesmartphone/python-ousaged/ousaged b/packages/freesmartphone/python-ousaged/ousaged
deleted file mode 100644
index 7b62d7f93c..0000000000
--- a/packages/freesmartphone/python-ousaged/ousaged
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# odeviced  This shell script starts and stops the open device daemon.
-#
-# chkconfig: 345 90 20
-# description: py-ousaged is the open usage daemon
-# processname: python
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=odeviced
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-        echo -n "Starting open usage daemon: "
-        start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ousaged
-        if [ $? = 0 ]; then
-            echo "(ok)"
-        else
-            echo "(failed)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping open usage daemon: "
-        start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
-        rm -f /var/run/${NAME}.pid
-        echo "(done)"
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-        echo "Usage: /etc/init.d/ousaged {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/packages/freesmartphone/python-ousaged_git.bb b/packages/freesmartphone/python-ousaged_git.bb
deleted file mode 100644
index 1188da34a3..0000000000
--- a/packages/freesmartphone/python-ousaged_git.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "The Open Usage Daemon Prototype in Python"
-HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenUsageDaemon"
-AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
-SECTION = "console/network"
-DEPENDS = "python-cython-native python-pyrex-native"
-LICENSE = "GPLv2"
-PV = "0.7.9+gitr${SRCREV}"
-PR = "r1"
-
-inherit distutils update-rc.d
-
-INITSCRIPT_NAME = "ousaged"
-INITSCRIPT_PARAMS = "defaults 21"
-
-SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/usaged.git;protocol=git;branch=master \
-  file://ousaged \
-"
-S = "${WORKDIR}/git"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/ousaged ${D}${sysconfdir}/init.d/
-	install -d ${D}${sysconfdir}/dbus-1/system.d/
-	mv -f ${D}${datadir}/etc/dbus-1/system.d/ousaged.conf ${D}${sysconfdir}/dbus-1/system.d/
-}
-
-RDEPENDS_${PN} += "\
-  python-dbus \
-  python-pygobject \
-  python-pyrtc \
-  python-syslog \
-  python-odeviced \
-"
-
-FILES_${PN} += "${sysconfdir}"
-- 
cgit v1.2.3


From 4fe64e497bb8af2ca8298c7b5af3f52d68e0467d Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 16 Jul 2008 08:12:33 +0000
Subject: remove deprecated openmoko stuff, it's no longer buildable anyways

---
 packages/openmoko-3rdparty/.mtn2git_empty          |    0
 packages/openmoko-3rdparty/omext_0.2.bb            |   12 +
 .../openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb  |   33 +
 .../openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb  |   11 +
 packages/openmoko-apps/.mtn2git_empty              |    0
 packages/openmoko-apps/files/.mtn2git_empty        |    0
 .../openmoko-apps/files/unbreak-messages.patch     |   29 -
 packages/openmoko-apps/omext_0.2.bb                |   12 -
 packages/openmoko-apps/openmoko-appmanager_svn.bb  |    7 -
 packages/openmoko-apps/openmoko-calculator_svn.bb  |    9 -
 packages/openmoko-apps/openmoko-dialer_svn.bb      |    9 -
 packages/openmoko-apps/openmoko-footer_svn.bb      |    6 -
 packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb |   33 -
 packages/openmoko-apps/openmoko-messages_svn.bb    |    7 -
 .../openmoko-simplemediaplayer_svn.bb              |   19 -
 packages/openmoko-apps/openmoko-taskmanager_svn.bb |    6 -
 .../openmoko-apps/openmoko-terminal/.mtn2git_empty |    0
 .../openmoko-apps/openmoko-terminal/gtkterm2rc     |   85 --
 .../openmoko-terminal/openmoko-terminal.desktop    |   12 -
 .../openmoko-terminal/openmoko-terminal.png        |  Bin 11078 -> 0 bytes
 packages/openmoko-apps/openmoko-terminal_svn.bb    |   34 -
 packages/openmoko-inputmethods/.mtn2git_empty      |    0
 .../openmoko-inputmethods/openmoko-keyboard_svn.bb |   20 -
 packages/openmoko-pim/.mtn2git_empty               |    0
 packages/openmoko-pim/files/.mtn2git_empty         |    0
 packages/openmoko-pim/files/index.theme            |  654 ------------
 packages/openmoko-pim/files/intltool-update.in     | 1089 --------------------
 packages/openmoko-pim/files/openmoko-dates.desktop |   12 -
 packages/openmoko-pim/files/openmoko-dates.png     |  Bin 12121 -> 0 bytes
 packages/openmoko-pim/files/stock_contact.png      |  Bin 2311 -> 0 bytes
 packages/openmoko-pim/files/stock_person.png       |  Bin 2280 -> 0 bytes
 packages/openmoko-pim/openmoko-contacts_svn.bb     |   31 -
 packages/openmoko-pim/openmoko-dates_svn.bb        |   29 -
 packages/openmoko-pim/openmoko-tasks_svn.bb        |   15 -
 packages/openmoko-pim/openmoko-today_svn.bb        |    8 -
 packages/openmoko-tools/.mtn2git_empty             |    0
 .../openmoko-tools/openmoko-chordmaster_svn.bb     |    6 -
 packages/openmoko-tools/pty-forward-native.bb      |   24 -
 packages/openmoko-tools/serial-forward.bb          |   15 -
 packages/openmoko2/settingsgui_0.7+0.8-beta.bb     |   11 -
 packages/serial-utils/.mtn2git_empty               |    0
 packages/serial-utils/pty-forward-native.bb        |   24 +
 packages/serial-utils/serial-forward.bb            |   15 +
 43 files changed, 95 insertions(+), 2182 deletions(-)
 create mode 100644 packages/openmoko-3rdparty/.mtn2git_empty
 create mode 100644 packages/openmoko-3rdparty/omext_0.2.bb
 create mode 100644 packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb
 create mode 100644 packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb
 delete mode 100644 packages/openmoko-apps/.mtn2git_empty
 delete mode 100644 packages/openmoko-apps/files/.mtn2git_empty
 delete mode 100644 packages/openmoko-apps/files/unbreak-messages.patch
 delete mode 100644 packages/openmoko-apps/omext_0.2.bb
 delete mode 100644 packages/openmoko-apps/openmoko-appmanager_svn.bb
 delete mode 100644 packages/openmoko-apps/openmoko-calculator_svn.bb
 delete mode 100644 packages/openmoko-apps/openmoko-dialer_svn.bb
 delete mode 100644 packages/openmoko-apps/openmoko-footer_svn.bb
 delete mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
 delete mode 100644 packages/openmoko-apps/openmoko-messages_svn.bb
 delete mode 100644 packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
 delete mode 100644 packages/openmoko-apps/openmoko-taskmanager_svn.bb
 delete mode 100644 packages/openmoko-apps/openmoko-terminal/.mtn2git_empty
 delete mode 100644 packages/openmoko-apps/openmoko-terminal/gtkterm2rc
 delete mode 100644 packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
 delete mode 100644 packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
 delete mode 100644 packages/openmoko-apps/openmoko-terminal_svn.bb
 delete mode 100644 packages/openmoko-inputmethods/.mtn2git_empty
 delete mode 100644 packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
 delete mode 100644 packages/openmoko-pim/.mtn2git_empty
 delete mode 100644 packages/openmoko-pim/files/.mtn2git_empty
 delete mode 100644 packages/openmoko-pim/files/index.theme
 delete mode 100644 packages/openmoko-pim/files/intltool-update.in
 delete mode 100644 packages/openmoko-pim/files/openmoko-dates.desktop
 delete mode 100644 packages/openmoko-pim/files/openmoko-dates.png
 delete mode 100644 packages/openmoko-pim/files/stock_contact.png
 delete mode 100644 packages/openmoko-pim/files/stock_person.png
 delete mode 100644 packages/openmoko-pim/openmoko-contacts_svn.bb
 delete mode 100644 packages/openmoko-pim/openmoko-dates_svn.bb
 delete mode 100644 packages/openmoko-pim/openmoko-tasks_svn.bb
 delete mode 100644 packages/openmoko-pim/openmoko-today_svn.bb
 delete mode 100644 packages/openmoko-tools/.mtn2git_empty
 delete mode 100644 packages/openmoko-tools/openmoko-chordmaster_svn.bb
 delete mode 100644 packages/openmoko-tools/pty-forward-native.bb
 delete mode 100644 packages/openmoko-tools/serial-forward.bb
 delete mode 100644 packages/openmoko2/settingsgui_0.7+0.8-beta.bb
 create mode 100644 packages/serial-utils/.mtn2git_empty
 create mode 100644 packages/serial-utils/pty-forward-native.bb
 create mode 100644 packages/serial-utils/serial-forward.bb

(limited to 'packages')

diff --git a/packages/openmoko-3rdparty/.mtn2git_empty b/packages/openmoko-3rdparty/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/openmoko-3rdparty/omext_0.2.bb b/packages/openmoko-3rdparty/omext_0.2.bb
new file mode 100644
index 0000000000..203b84e3df
--- /dev/null
+++ b/packages/openmoko-3rdparty/omext_0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Openmoko extensionhandler"
+LICENSE = "GPLv2"
+
+DEPENDS = "dbus-glib"
+
+SRC_URI = "http://www.devzero.net/openmoko/dist/omext-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+S = "{WORKDIR}/openmoko-extensionhandler"
+
+
diff --git a/packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb b/packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb
new file mode 100644
index 0000000000..71a9f3cdb6
--- /dev/null
+++ b/packages/openmoko-3rdparty/openmoko-gps_0.0.1+svnr9.bb
@@ -0,0 +1,33 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: openmoko-gps_svn.bb
+# Date: 20080101 (YMD)
+
+DESCRIPTION = "A tiny GPS output parser for the Openmoko platform."
+HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenmokoGPS"
+SECTION = "base"
+LICENSE = "GPL"
+
+RDEPENDS = "python-pygtk"
+
+PR = "r0" 
+
+######################################################################################
+
+SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=9"
+
+S = "${WORKDIR}/gps"
+
+do_install() {
+	install -d ${D}/usr/bin
+	install -d ${D}/usr/share/applications/
+	install -d ${D}/usr/share/pixmaps/
+	
+	install -m 0755 ${S}/gps_reader.py ${D}/usr/bin
+	install -m 0644 ${S}/openmoko-gps.desktop ${D}/usr/share/applications/
+	install -m 0644 ${S}/*.png ${D}/usr/share/pixmaps/
+}
diff --git a/packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb b/packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb
new file mode 100644
index 0000000000..f0d6f84ce6
--- /dev/null
+++ b/packages/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Openmoko Settings GUI"
+AUTHOR = "Kristian M."
+SECTION = "openmoko/applications"
+RDEPENDS = "python-pygtk python-subprocess python-threading"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8-beta.tar.bz2"
+S = "${WORKDIR}/settingsgui-0.8-beta"
+
+inherit distutils
diff --git a/packages/openmoko-apps/.mtn2git_empty b/packages/openmoko-apps/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/openmoko-apps/files/.mtn2git_empty b/packages/openmoko-apps/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/openmoko-apps/files/unbreak-messages.patch b/packages/openmoko-apps/files/unbreak-messages.patch
deleted file mode 100644
index c8d3413c0b..0000000000
--- a/packages/openmoko-apps/files/unbreak-messages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: sms-membership-window.c
-===================================================================
---- sms-membership-window.c	(wersja 1565)
-+++ openmoko-messages/src/sms-membership-window.c	(kopia robocza)
-@@ -36,9 +36,6 @@
- #define SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(o)   (G_TYPE_INSTANCE_GET_PRIVATE ((o), SMS_TYPE_MEMBERSHIP_WINDOW, SmsMembershipWindowPrivate))
- 
- typedef struct _SmsMembershipWindowPrivate SmsMembershipWindowPrivate;
--typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
--    GtkTreeIter *iter,
--    gpointer data);
- 
- struct _SmsMembershipWindowPrivate
-   {
-Index: main.c
-===================================================================
---- main.c	(wersja 1565)
-+++ openmoko-messages/src/main.c	(kopia robocza)
-@@ -41,10 +41,6 @@
- 
- #include <gtk/gtk.h>
- 
--typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
--    GtkTreeIter *iter,
--    gpointer data);
--
- gboolean init_dbus (MessengerData* d)
- {
-   DBusError error;
diff --git a/packages/openmoko-apps/omext_0.2.bb b/packages/openmoko-apps/omext_0.2.bb
deleted file mode 100644
index 203b84e3df..0000000000
--- a/packages/openmoko-apps/omext_0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Openmoko extensionhandler"
-LICENSE = "GPLv2"
-
-DEPENDS = "dbus-glib"
-
-SRC_URI = "http://www.devzero.net/openmoko/dist/omext-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-S = "{WORKDIR}/openmoko-extensionhandler"
-
-
diff --git a/packages/openmoko-apps/openmoko-appmanager_svn.bb b/packages/openmoko-apps/openmoko-appmanager_svn.bb
deleted file mode 100644
index 7acc872bc1..0000000000
--- a/packages/openmoko-apps/openmoko-appmanager_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "The Openmoko Application Manager"
-SECTION = "openmoko/applications"
-DEPENDS += "ipkg"
-PV = "0.0.1+svnr${SRCREV}"
-
-inherit openmoko
-
diff --git a/packages/openmoko-apps/openmoko-calculator_svn.bb b/packages/openmoko-apps/openmoko-calculator_svn.bb
deleted file mode 100644
index 39c180cc05..0000000000
--- a/packages/openmoko-apps/openmoko-calculator_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "The Openmoko Calculator Application"
-SECTION = "openmoko/applications"
-AUTHOR = "Rodolphe Ortalo <rodolphe.ortalo@free.fr>"
-
-PV = "0.0.3+svnr${SRCREV}"
-PR = "r0"
-
-inherit openmoko
-
diff --git a/packages/openmoko-apps/openmoko-dialer_svn.bb b/packages/openmoko-apps/openmoko-dialer_svn.bb
deleted file mode 100644
index 8a0f3fd999..0000000000
--- a/packages/openmoko-apps/openmoko-dialer_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "The Openmoko Dialer"
-SECTION = "openmoko/applications"
-PV = "0.0.1+svnr${SRCREV}"
-
-inherit openmoko
-
-DEPENDS += " eds-dbus libgsmd"
-
-
diff --git a/packages/openmoko-apps/openmoko-footer_svn.bb b/packages/openmoko-apps/openmoko-footer_svn.bb
deleted file mode 100644
index 83ab7ab045..0000000000
--- a/packages/openmoko-apps/openmoko-footer_svn.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-DESCRIPTION = "The Openmoko Footer"
-SECTION = "openmoko/applications"
-PV = "0.0.1+svnr${SRCREV}"
-
-inherit openmoko
-
diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
deleted file mode 100644
index 71a9f3cdb6..0000000000
--- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: openmoko-gps_svn.bb
-# Date: 20080101 (YMD)
-
-DESCRIPTION = "A tiny GPS output parser for the Openmoko platform."
-HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenmokoGPS"
-SECTION = "base"
-LICENSE = "GPL"
-
-RDEPENDS = "python-pygtk"
-
-PR = "r0" 
-
-######################################################################################
-
-SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=9"
-
-S = "${WORKDIR}/gps"
-
-do_install() {
-	install -d ${D}/usr/bin
-	install -d ${D}/usr/share/applications/
-	install -d ${D}/usr/share/pixmaps/
-	
-	install -m 0755 ${S}/gps_reader.py ${D}/usr/bin
-	install -m 0644 ${S}/openmoko-gps.desktop ${D}/usr/share/applications/
-	install -m 0644 ${S}/*.png ${D}/usr/share/pixmaps/
-}
diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb
deleted file mode 100644
index a79353b603..0000000000
--- a/packages/openmoko-apps/openmoko-messages_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "The Openmoko Messaging Application"
-SECTION = "openmoko/applications"
-
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r2"
-
-inherit openmoko
diff --git a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
deleted file mode 100644
index c90d35e3d5..0000000000
--- a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "The Openmoko Media Player"
-SECTION = "openmoko/applications"
-DEPENDS += "alsa-lib dbus-glib id3lib libvorbis"
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r1"
-
-inherit openmoko
-
-PARALLEL_MAKE =""
-
-do_install_prepend() {
-	touch mkinstalldirs
-}
-
-
-FILES_${PN} += " \
-                ${datadir}/images \
-		${libdir}/bmp/*/*.so \
-	       "
diff --git a/packages/openmoko-apps/openmoko-taskmanager_svn.bb b/packages/openmoko-apps/openmoko-taskmanager_svn.bb
deleted file mode 100644
index e7725bee44..0000000000
--- a/packages/openmoko-apps/openmoko-taskmanager_svn.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-DESCRIPTION = "The Openmoko Task Manager"
-SECTION = "openmoko/applications"
-PV = "0.0.1+svnr${SRCREV}"
-
-inherit openmoko
-
diff --git a/packages/openmoko-apps/openmoko-terminal/.mtn2git_empty b/packages/openmoko-apps/openmoko-terminal/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/openmoko-apps/openmoko-terminal/gtkterm2rc b/packages/openmoko-apps/openmoko-terminal/gtkterm2rc
deleted file mode 100644
index d68f01ab57..0000000000
--- a/packages/openmoko-apps/openmoko-terminal/gtkterm2rc
+++ /dev/null
@@ -1,85 +0,0 @@
-##
-# 1=RIGHT, 2=TOP, 3=BOTTOM, 4=LEFT
-##
-notebookPanel=3
-
-##
-# 0=HIDDEN, 1=LEFT, 2=RIGHT
-##
-terminalScrollbar=2
-
-##
-# 0=NO SCROLLBAR
-##
-maxScrollbackBuffer=999
-
-##
-# 0=FALSE, 1=TRUE
-##
-quitPRGonExitLastTerminal=1
-
-##
-# 0=FALSE, 1=TRUE
-##
-showTabsByOneTerminal=0
-
-##
-#A Font name: use gnome-font-properties to look at available fonts
-##
-terminalFont=BitStream Vera Sans Mono 11
-
-##
-# Separator for marking with mouse
-##
-worldClass=-A-Za-z0-9/_:.,?+%=
-
-##
-# 0=FALSE, 1=TRUE
-##
-scrollOnKeyStroke=1
-
-##
-# 0=FALSE, 1=TRUE
-##
-scrollOnOutput=0
-
-##
-# 0=FALSE, 1=TRUE
-##
-blink=1
-
-##
-# 0=FALSE, 1=TRUE
-##
-beep=1
-
-##
-# x y Default Terminal Size in pix
-##
-terminalSize=80 25
-
-##
-# NEW COLOR Definition
-##
-red=0x0000 0xcccc 0x0000 0xaaaa 0x0000 0xaaaa 0x6666 0xaaaa 0x0000 0xcccc 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff
-grn=0x0000 0xcccc 0x0000 0x0000 0xaaaa 0x5555 0x6666 0x0000 0xaaaa 0xcccc 0x5555 0x5555 0xffff 0xffff 0x5555 0x5555 0xffff 0xffff
-blu=0x0000 0xcccc 0x0000 0x0000 0x0000 0x0000 0xffff 0xaaaa 0xaaaa 0xcccc 0x5555 0x5555 0x5555 0x5555 0xffff 0xffff 0xffff 0xffff
-
-##
-# COLOR Definition
-##
-
-##
-# First section
-##
-[section]
-match=
-worldClass=-A-Za-z0-9/_:.,?+%=
-scrollOnKeyStroke=1
-scrollOnOutput=0
-beep=1
-blink=1
-red=0x0000 0xcccc 0x0000 0xaaaa 0x0000 0xaaaa 0x6666 0xaaaa 0x0000 0x0000 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff
-grn=0x0000 0xcccc 0x0000 0x0000 0xaaaa 0x5555 0x6666 0x0000 0xaaaa 0xcccc 0x5555 0x5555 0xffff 0xffff 0x5555 0x5555 0xffff 0xffff
-blu=0x0000 0xcccc 0x0000 0x0000 0x0000 0x0000 0xffff 0xaaaa 0xaaaa 0x0000 0x5555 0x5555 0x5555 0x5555 0xffff 0xffff 0xffff 0xffff
-
diff --git a/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop b/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
deleted file mode 100644
index ced7c0b8e2..0000000000
--- a/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Terminal
-Comment=Command Line Interface Terminal
-Exec=gtkterm2
-Icon=openmoko-terminal
-Terminal=false
-Type=Application
-Categories=GTK;Application;PIM;Office
-MimeType=text/x-vcard;
-SingleInstance=false
-StartupNotify=true
diff --git a/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png b/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
deleted file mode 100644
index 56e8e59628..0000000000
Binary files a/packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png and /dev/null differ
diff --git a/packages/openmoko-apps/openmoko-terminal_svn.bb b/packages/openmoko-apps/openmoko-terminal_svn.bb
deleted file mode 100644
index 1a33b03598..0000000000
--- a/packages/openmoko-apps/openmoko-terminal_svn.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "The Openmoko Command Line Console"
-SECTION = "openmoko/applications"
-RDEPENDS += "gtkterm2"
-PV = "1.0.0"
-PR = "r1"
-
-inherit openmoko
-
-SRC_URI = "file://openmoko-terminal.png \
-           file://openmoko-terminal.desktop \
-           file://gtkterm2rc"
-
-do_install() {
-        install -d ${D}${sysconfdir}/skel
-        install -d ${D}${datadir}/pixmaps
-        install -d ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/openmoko-terminal.png ${D}${datadir}/pixmaps/
-        install -m 0644 ${WORKDIR}/openmoko-terminal.desktop ${D}${datadir}/applications/
-        install -m 0644 ${WORKDIR}/gtkterm2rc ${D}${sysconfdir}/skel/.gtkterm2rc
-}
-
-pkg_postinst_openmoko-terminal() {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1 # don't run at image generation time
-else
-    if [ -e "$HOME/.gtkterm2rc" ]; then
-        echo "not overriding $HOME/.gtkterm2rc"
-    else
-        echo "installing $HOME/.gtkterm2rc from /etc/skel"
-        cp -f ${sysconfdir}/skel/.gtkterm2rc $HOME/
-    fi
-fi
-}
diff --git a/packages/openmoko-inputmethods/.mtn2git_empty b/packages/openmoko-inputmethods/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
deleted file mode 100644
index e5dc9264d0..0000000000
--- a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Matchbox virtual keyboard for X11 - Openmoko fork"
-LICENSE = "GPL"
-DEPENDS = "libfakekey expat libxft"
-SECTION = "openmoko/inputmethods"
-PV = "0.0+svnr${SRCREV}"
-PR = "r1"
-
-inherit openmoko autotools pkgconfig gettext
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/inputmethods;module=${PN};proto=http"
-
-S = "${WORKDIR}/${PN}"
-
-EXTRA_OECONF = "--disable-cairo"
-
-FILES_${PN} = "${bindir}/* \
-	       ${datadir}/applications \
-	       ${datadir}/pixmaps \
-	       ${datadir}/openmoko-keyboard"
-
diff --git a/packages/openmoko-pim/.mtn2git_empty b/packages/openmoko-pim/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/openmoko-pim/files/.mtn2git_empty b/packages/openmoko-pim/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/openmoko-pim/files/index.theme b/packages/openmoko-pim/files/index.theme
deleted file mode 100644
index 4e9cf67820..0000000000
--- a/packages/openmoko-pim/files/index.theme
+++ /dev/null
@@ -1,654 +0,0 @@
-[Icon Theme]
-Name=Hicolor
-Comment=Fallback icon theme
-Hidden=true
-Directories=192x192/apps,128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,72x72/apps,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,36x36/apps,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,24x24/actions,24x24/apps,24x24/devices,24x24/filesystems,24x24/mimetypes,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/document,32x32/stock/form,32x32/stock/generic,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/document,36x36/stock/form,36x36/stock/generic,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/document,48x48/stock/form,48x48/stock/generic,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,scalable/emblems,192x192/emblems,96x96/emblems,72x72/emblems,48x48/emblems,36x36/emblems,24x24/emblems,16x16/emblems,12x12/emblems
-
-[16x16/actions]
-Size=16
-Context=Actions
-Type=Threshold
-
-[16x16/apps]
-Size=16
-Context=Applications
-Type=Threshold
-
-[16x16/devices]
-Size=16
-Context=Devices
-Type=Threshold
-
-[16x16/filesystems]
-Size=16
-Context=FileSystems
-Type=Threshold
-
-[16x16/mimetypes]
-Size=16
-Context=MimeTypes
-Type=Threshold
-
-[22x22/actions]
-Size=22
-Context=Actions
-Type=Threshold
-
-[22x22/apps]
-Size=22
-Context=Applications
-Type=Threshold
-
-[22x22/devices]
-Size=22
-Context=Devices
-Type=Threshold
-
-[22x22/filesystems]
-Size=22
-Context=FileSystems
-Type=Threshold
-
-[22x22/mimetypes]
-Size=22
-Context=MimeTypes
-Type=Threshold
-
-[24x24/actions]
-Size=24
-Context=Actions
-Type=Threshold
-
-[24x24/apps]
-Size=24
-Context=Applications
-Type=Threshold
-
-[24x24/devices]
-Size=24
-Context=Devices
-Type=Threshold
-
-[24x24/filesystems]
-Size=24
-Context=FileSystems
-Type=Threshold
-
-[24x24/mimetypes]
-Size=24
-Context=MimeTypes
-Type=Threshold
-
-[32x32/actions]
-Size=32
-Context=Actions
-Type=Threshold
-
-[32x32/apps]
-Size=32
-Context=Applications
-Type=Threshold
-
-[32x32/devices]
-Size=32
-Context=Devices
-Type=Threshold
-
-[32x32/filesystems]
-Size=32
-Context=FileSystems
-Type=Threshold
-
-[32x32/mimetypes]
-Size=32
-Context=MimeTypes
-Type=Threshold
-
-[36x36/apps]
-Size=36
-Context=Applications
-Type=Threshold
-
-[48x48/actions]
-Size=48
-Context=Actions
-Type=Threshold
-
-[48x48/apps]
-Size=48
-Context=Applications
-Type=Threshold
-
-[48x48/devices]
-Size=48
-Context=Devices
-Type=Threshold
-
-[48x48/filesystems]
-Size=48
-Context=FileSystems
-Type=Threshold
-
-[48x48/mimetypes]
-Size=48
-Context=MimeTypes
-Type=Threshold
-
-[64x64/actions]
-Size=64
-Context=Actions
-Type=Threshold
-
-[64x64/apps]
-Size=64
-Context=Applications
-Type=Threshold
-
-[64x64/devices]
-Size=64
-Context=Devices
-Type=Threshold
-
-[64x64/filesystems]
-Size=64
-Context=FileSystems
-Type=Threshold
-
-[64x64/mimetypes]
-Size=64
-Context=MimeTypes
-Type=Threshold
-
-[72x72/apps]
-Size=72
-Context=Applications
-Type=Threshold
-
-[96x96/actions]
-Size=96
-Context=Actions
-Type=Threshold
-
-[96x96/apps]
-Size=96
-Context=Applications
-Type=Threshold
-
-[96x96/devices]
-Size=96
-Context=Devices
-Type=Threshold
-
-[96x96/filesystems]
-Size=96
-Context=FileSystems
-Type=Threshold
-
-[96x96/mimetypes]
-Size=96
-Context=MimeTypes
-Type=Threshold
-
-[128x128/actions]
-Size=128
-Context=Actions
-Type=Threshold
-
-[128x128/apps]
-Size=128
-Context=Applications
-Type=Threshold
-
-[128x128/devices]
-Size=128
-Context=Devices
-Type=Threshold
-
-[128x128/filesystems]
-Size=128
-Context=FileSystems
-Type=Threshold
-
-[128x128/mimetypes]
-Size=128
-Context=MimeTypes
-Type=Threshold
-
-[192x192/apps]
-Size=192
-Context=Applications
-Type=Threshold
-
-
-[scalable/actions]
-MinSize=1
-Size=128
-MaxSize=256
-Context=Actions
-Type=Scalable
-
-[scalable/apps]
-MinSize=1
-Size=128
-MaxSize=256
-Context=Applications
-Type=Scalable
-
-[scalable/devices]
-MinSize=1
-Size=128
-MaxSize=256
-Context=Devices
-Type=Scalable
-
-[scalable/filesystems]
-MinSize=1
-Size=128
-MaxSize=256
-Context=FileSystems
-Type=Scalable
-
-[scalable/mimetypes]
-MinSize=1
-Size=128
-MaxSize=256
-Context=MimeTypes
-Type=Scalable
-
-[16x16/stock/chart]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/code]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/data]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/document]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/form]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/generic]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/image]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/io]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/media]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/navigation]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/net]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/object]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/table]
-Size=16
-Context=Stock
-Type=Threshold
-
-[16x16/stock/text]
-Size=16
-Context=Stock
-Type=Threshold
-
-[24x24/stock/chart]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/code]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/data]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/document]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/form]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/generic]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/image]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/io]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/media]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/navigation]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/net]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/object]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/table]
-Size=24
-Context=Stock
-Type=Threshold
-
-[24x24/stock/text]
-Size=24
-Context=Stock
-Type=Threshold
-
-[32x32/stock/chart]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/code]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/data]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/document]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/form]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/generic]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/image]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/io]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/media]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/navigation]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/net]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/object]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/table]
-Size=32
-Context=Stock
-Type=Threshold
-
-[32x32/stock/text]
-Size=32
-Context=Stock
-Type=Threshold
-
-[36x36/stock/chart]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/code]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/data]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/document]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/form]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/generic]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/image]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/io]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/media]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/navigation]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/net]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/object]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/table]
-Size=36
-Context=Stock
-Type=Threshold
-
-[36x36/stock/text]
-Size=36
-Context=Stock
-Type=Threshold
-
-[48x48/stock/chart]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/code]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/data]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/document]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/form]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/generic]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/image]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/io]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/media]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/navigation]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/net]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/object]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/table]
-Size=48
-Context=Stock
-Type=Threshold
-
-[48x48/stock/text]
-Size=48
-Context=Stock
-Type=Threshold
-
-[scalable/emblems]
-MinSize=1
-Size=128
-MaxSize=256
-Context=Emblems
-Type=Scalable
-
-[192x192/emblems]
-Size=192
-Context=Emblems
-Type=Threshold
-
-[96x96/emblems]
-Size=96
-Context=Emblems
-Type=Threshold
-
-[72x72/emblems]
-Size=72
-Context=Emblems
-Type=Threshold
-
-[48x48/emblems]
-Size=48
-Context=Emblems
-Type=Threshold
-
-[36x36/emblems]
-Size=36
-Context=Emblems
-Type=Threshold
-
-[24x24/emblems]
-Size=24
-Context=Emblems
-Type=Threshold
-
-[16x16/emblems]
-Size=16
-Context=Emblems
-Type=Threshold
-
-[12x12/emblems]
-Size=12
-Context=Emblems
-Type=Threshold
-
diff --git a/packages/openmoko-pim/files/intltool-update.in b/packages/openmoko-pim/files/intltool-update.in
deleted file mode 100644
index 0342a2740c..0000000000
--- a/packages/openmoko-pim/files/intltool-update.in
+++ /dev/null
@@ -1,1089 +0,0 @@
-#!@INTLTOOL_PERL@
-# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
-
-#
-#  The Intltool Message Updater
-#
-#  Copyright (C) 2000-2003 Free Software Foundation.
-#
-#  Intltool is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License 
-#  version 2 published by the Free Software Foundation.
-#
-#  Intltool is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#  As a special exception to the GNU General Public License, if you
-#  distribute this file as part of a program that contains a
-#  configuration script generated by Autoconf, you may include it under
-#  the same distribution terms that you use for the rest of that program.
-#
-#  Authors: Kenneth Christiansen <kenneth@gnu.org>
-#           Maciej Stachowiak
-#           Darin Adler <darin@bentspoon.com>
-
-## Release information
-my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.0";
-my $PACKAGE = "intltool";
-
-## Loaded modules
-use strict;
-use Getopt::Long;
-use Cwd;
-use File::Copy;
-use File::Find;
-
-## Scalars used by the option stuff
-my $HELP_ARG 	   = 0;
-my $VERSION_ARG    = 0;
-my $DIST_ARG	   = 0;
-my $POT_ARG	   = 0;
-my $HEADERS_ARG    = 0;
-my $MAINTAIN_ARG   = 0;
-my $REPORT_ARG     = 0;
-my $VERBOSE	   = 0;
-my $GETTEXT_PACKAGE = "";
-my $OUTPUT_FILE    = "";
-
-my @languages;
-my %varhash = ();
-my %po_files_by_lang = ();
-
-# Regular expressions to categorize file types.
-# FIXME: Please check if the following is correct
-
-my $xml_support =
-"xml(?:\\.in)*|".	# http://www.w3.org/XML/ (Note: .in is not required)
-"ui|".			# Bonobo specific - User Interface desc. files
-"lang|".		# ?
-"glade2?(?:\\.in)*|".	# Glade specific - User Interface desc. files (Note: .in is not required)
-"scm(?:\\.in)*|".	# ? (Note: .in is not required)
-"oaf(?:\\.in)+|".	# DEPRECATED: Replaces by Bonobo .server files 
-"etspec|".		# ?
-"server(?:\\.in)+|".	# Bonobo specific
-"sheet(?:\\.in)+|".	# ?
-"schemas(?:\\.in)+|".	# GConf specific
-"pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+";	# GOK specific. 
-
-my $ini_support =
-"icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
-"desktop(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
-"caves(?:\\.in)+|".	# GNOME Games specific
-"directory(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
-"soundlist(?:\\.in)+|".	# GNOME specific
-"keys(?:\\.in)+|".	# GNOME Mime database specific
-"theme(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
-"service(?:\\.in)+";    # DBus specific
-
-my $buildin_gettext_support = 
-"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
-
-## Always flush buffer when printing
-$| = 1;
-
-## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
-my $POTFILES_in;
-
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
-$POTFILES_in = "<$SRCDIR/POTFILES.in";
-
-my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
-
-## Handle options
-GetOptions 
-(
- "help" 	       => \$HELP_ARG,
- "version" 	       => \$VERSION_ARG,
- "dist|d"	       => \$DIST_ARG,
- "pot|p"	       => \$POT_ARG,
- "headers|s"	       => \$HEADERS_ARG,
- "maintain|m"	       => \$MAINTAIN_ARG,
- "report|r"	       => \$REPORT_ARG,
- "verbose|x"	       => \$VERBOSE,
- "gettext-package|g=s" => \$GETTEXT_PACKAGE,
- "output-file|o=s"     => \$OUTPUT_FILE,
- ) or &Console_WriteError_InvalidOption;
-
-&Console_Write_IntltoolHelp if $HELP_ARG;
-&Console_Write_IntltoolVersion if $VERSION_ARG;
-
-my $arg_count = ($DIST_ARG > 0)
-    + ($POT_ARG > 0)
-    + ($HEADERS_ARG > 0)
-    + ($MAINTAIN_ARG > 0)
-    + ($REPORT_ARG > 0);
-
-&Console_Write_IntltoolHelp if $arg_count > 1;
-
-# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
-
-if ($POT_ARG)
-{
-    &GenerateHeaders;
-    &GeneratePOTemplate;
-}
-elsif ($HEADERS_ARG)
-{
-    &GenerateHeaders;
-}
-elsif ($MAINTAIN_ARG)
-{
-    &FindLeftoutFiles;
-}
-elsif ($REPORT_ARG)
-{
-    &GenerateHeaders;
-    &GeneratePOTemplate;
-    &Console_Write_CoverageReport;
-}
-elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/)
-{
-    my $lang = $ARGV[0];
-
-    ## Report error if the language file supplied
-    ## to the command line is non-existent
-    &Console_WriteError_NotExisting("$SRCDIR/$lang.po")
-        if ! -s "$SRCDIR/$lang.po";
-
-    if (!$DIST_ARG)
-    {
-	print "Working, please wait..." if $VERBOSE;
-	&GenerateHeaders;
-	&GeneratePOTemplate;
-    }
-    &POFile_Update ($lang, $OUTPUT_FILE);
-    &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE);
-} 
-else 
-{
-    &Console_Write_IntltoolHelp;
-}
-
-exit;
-
-#########
-
-sub Console_Write_IntltoolVersion
-{
-    print <<_EOF_;
-${PROGRAM} (${PACKAGE}) $VERSION
-Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.
-
-Copyright (C) 2000-2003 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-_EOF_
-    exit;
-}
-
-sub Console_Write_IntltoolHelp
-{
-    print <<_EOF_;
-Usage: ${PROGRAM} [OPTION]... LANGCODE
-Updates PO template files and merge them with the translations.
-
-Mode of operation (only one is allowed):
-  -p, --pot                   generate the PO template only
-  -s, --headers               generate the header files in POTFILES.in
-  -m, --maintain              search for left out files from POTFILES.in
-  -r, --report                display a status report for the module
-  -d, --dist                  merge LANGCODE.po with existing PO template
-
-Extra options:
-  -g, --gettext-package=NAME  override PO template name, useful with --pot
-  -o, --output-file=FILE      write merged translation to FILE
-  -x, --verbose               display lots of feedback
-      --help                  display this help and exit
-      --version               output version information and exit
-
-Examples of use:
-${PROGRAM} --pot    just create a new PO template
-${PROGRAM} xy       create new PO template and merge xy.po with it
-
-Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE")
-or send email to <xml-i18n-tools\@gnome.org>.
-_EOF_
-    exit;
-}
-
-sub echo_n
-{
-    my $str = shift;
-    my $ret = `echo "$str"`;
-
-    $ret =~ s/\n$//; # do we need the "s" flag?
-
-    return $ret;
-}
-
-sub POFile_DetermineType ($) 
-{
-   my $type = $_;
-   my $gettext_type;
-
-   my $xml_regex     = "(?:" . $xml_support . ")";
-   my $ini_regex     = "(?:" . $ini_support . ")";
-   my $buildin_regex = "(?:" . $buildin_gettext_support . ")";
-
-   if ($type =~ /\[type: gettext\/([^\]].*)]/) 
-   {
-	$gettext_type=$1;
-   }
-   elsif ($type =~ /schemas(\.in)+$/) 
-   {
-	$gettext_type="schemas";
-   }
-   elsif ($type =~ /glade2?(\.in)*$/) 
-   {
-       $gettext_type="glade";
-   }
-   elsif ($type =~ /scm(\.in)*$/) 
-   {
-       $gettext_type="scheme";
-   }
-   elsif ($type =~ /keys(\.in)+$/) 
-   {
-       $gettext_type="keys";
-   }
-
-   # bucket types
-
-   elsif ($type =~ /$xml_regex$/) 
-   {
-       $gettext_type="xml";
-   }
-   elsif ($type =~ /$ini_regex$/) 
-   { 
-       $gettext_type="ini";
-   }
-   elsif ($type =~ /$buildin_regex$/) 
-   {
-       $gettext_type="buildin";
-   }
-   else
-   { 
-       $gettext_type="unknown"; 
-   }
-
-   return "gettext\/$gettext_type";
-}
-
-sub TextFile_DetermineEncoding ($) 
-{
-    my $gettext_code="ASCII"; # All files are ASCII by default
-    my $filetype=`file $_ | cut -d ' ' -f 2`;
-
-    if ($? eq "0")
-    {
-	if ($filetype =~ /^(ISO|UTF)/)
-	{
-	    chomp ($gettext_code = $filetype);
-	}
-	elsif ($filetype =~ /^XML/)
-	{
-	    $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8
-	}
-    }
-
-    return $gettext_code;
-}
-
-sub isNotValidMissing
-{
-    my ($file) = @_;
-
-    return if $file =~ /^\{arch\}\/.*$/;
-    return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/;
-}
-
-sub FindLeftoutFiles
-{
-    my (@buf_i18n_plain,
-	@buf_i18n_xml,
-	@buf_i18n_xml_unmarked,
-	@buf_i18n_ini,
-	@buf_potfiles,
-	@buf_potfiles_ignore,
-	@buf_allfiles,
-	@buf_allfiles_sorted,
-	@buf_potfiles_sorted
-    );
-
-    ## Search and find all translatable files
-    find sub { 
-	push @buf_i18n_plain,        "$File::Find::name" if /\.($buildin_gettext_support)$/;
-	push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_support)$/;
-	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
-	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-	}, "..";
-
-
-    open POTFILES, $POTFILES_in or die "$PROGRAM:  there's no POTFILES.in!\n";
-    @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-    close POTFILES;
-
-    foreach (@buf_potfiles) {
-	s/^\[.*]\s*//;
-    }
-
-    print "Searching for missing translatable files...\n" if $VERBOSE;
-
-    ## Check if we should ignore some found files, when
-    ## comparing with POTFILES.in
-    foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
-    {
-	(-s $ignore) or next;
-
-	if ("$ignore" eq "POTFILES.ignore")
-	{
-	    print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n".
-		  "content of this file to POTFILES.skip.\n";
-	}
-
-	print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-	open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
-	    
-	while (<FILE>)
-	{
-	    push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/;
-	}
-	close FILE;
-
-	@buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
-    }
-
-    foreach my $file (@buf_i18n_plain)
-    {
-	my $in_comment = 0;
-	my $in_macro = 0;
-
-	open FILE, "<$file";
-	while (<FILE>)
-	{
-	    # Handle continued multi-line comment.
-	    if ($in_comment)
-	    {
-		next unless s-.*\*/--;
-		$in_comment = 0;
-	    }
-
-	    # Handle continued macro.
-	    if ($in_macro)
-	    {
-		$in_macro = 0 unless /\\$/;
-		next;
-	    }
-
-	    # Handle start of macro (or any preprocessor directive).
-	    if (/^\s*\#/)
-	    {
-		$in_macro = 1 if /^([^\\]|\\.)*\\$/;
-		next;
-	    }
-
-	    # Handle comments and quoted text.
-	    while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy
-	    {
-		my $match = $1;
-		if ($match eq "/*")
-		{
-		    if (!s-/\*.*?\*/--)
-		    {
-			s-/\*.*--;
-			$in_comment = 1;
-		    }
-		}
-		elsif ($match eq "//")
-		{
-		    s-//.*--;
-		}
-		else # ' or "
-		{
-		    if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)
-		    {
-			warn "mismatched quotes at line $. in $file\n";
-			s-$match.*--;
-		    }
-		}
-	    }	    
-
-	    if (/\.GetString ?\(QUOTEDTEXT/)
-	    {
-                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-                    ## Remove the first 3 chars and add newline
-                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                }
-		last;
-	    }
-
-	    if (/_\(QUOTEDTEXT/)
-	    {
-                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-                    ## Remove the first 3 chars and add newline
-                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                }
-		last;
-	    }
-	}
-	close FILE;
-    }
-
-    foreach my $file (@buf_i18n_xml) 
-    {
-	open FILE, "<$file";
-	
-	while (<FILE>) 
-	{
-	    # FIXME: share the pattern matching code with intltool-extract
-	    if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/)
-	    {
-                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                }
-		last;
-	    }
-	}
-	close FILE;
-    }
-
-    foreach my $file (@buf_i18n_ini)
-    {
-	open FILE, "<$file";
-	while (<FILE>) 
-	{
-	    if (/_(.*)=/)
-	    {
-                if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-                    push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-                }
-		last;
-	    }
-	}
-	close FILE;
-    }
-
-    foreach my $file (@buf_i18n_xml_unmarked)
-    {
-        if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-            push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-        }
-    }
-
-
-    @buf_allfiles_sorted = sort (@buf_allfiles);
-    @buf_potfiles_sorted = sort (@buf_potfiles);
-
-    my %in2;
-    foreach (@buf_potfiles_sorted) 
-    {
-	$in2{$_} = 1;
-    }
-
-    my @result;
-
-    foreach (@buf_allfiles_sorted)
-    {
-	if (!exists($in2{$_}))
-	{
-	    push @result, $_
-	}
-    }
-
-    my @buf_potfiles_notexist;
-
-    foreach (@buf_potfiles_sorted)
-    {
-	chomp (my $dummy = $_);
-	if ("$dummy" ne "" and ! -f "../$dummy")
-	{
-	    push @buf_potfiles_notexist, $_;
-	}
-    }
-
-    ## Save file with information about the files missing
-    ## if any, and give information about this procedure.
-    if (@result + @buf_potfiles_notexist > 0)
-    {
-	if (@result) 
-	{
-	    print "\n" if $VERBOSE;
-	    unlink "missing";
-	    open OUT, ">missing";
-	    print OUT @result;
-	    close OUT;
-	    warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n".
-	         "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n";
-	    print STDERR @result, "\n";
-	    warn "If some of these files are left out on purpose then please add them to\n".
-		 "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n".
-		 "of left out files has been written in the current directory.\n";
-	}
-	if (@buf_potfiles_notexist)
-	{
-	    unlink "notexist";
-	    open OUT, ">notexist";
-	    print OUT @buf_potfiles_notexist;
-	    close OUT;
-	    warn "\n" if ($VERBOSE or @result);
-	    warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
-	    warn @buf_potfiles_notexist, "\n";
-	    warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
-		 "containing this list of absent files has been written in the current directory.\n";
-	}
-    }
-
-    ## If there is nothing to complain about, notify the user
-    else {
-	print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE;