8 files changed, 54 insertions, 44 deletions
diff --git a/packages/speechd/.mtn2git_empty b/packages/dotconf/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/speechd/.mtn2git_empty
+++ b/packages/dotconf/.mtn2git_empty
diff --git a/packages/dotconf/dotconf_1.0.13.bb b/packages/dotconf/dotconf_1.0.13.bb
new file mode 100644
index 0000000000..332cba9bfa
--- /dev/null
+++ b/packages/dotconf/dotconf_1.0.13.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = " dot.conf is an easy to use and powerful configuration file parser library"
+HOMEPAGE = "http://www.azzit.de/dotconf/"
+LICENSE = "LGPLv2"
+
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "http://www.azzit.de/dotconf/download/v1.0/${PN}-${PV}.tar.gz \
+	  file://srcMakefile.am_00.patch;patch=1"
+
+do_stage () {
+        install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/
+        oe_libinstall -C src -a -so libdotconf ${STAGING_LIBDIR}/
+}
diff --git a/packages/dotconf/files/.mtn2git_empty b/packages/dotconf/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dotconf/files/.mtn2git_empty
diff --git a/packages/dotconf/files/srcMakefile.am_00.patch b/packages/dotconf/files/srcMakefile.am_00.patch
new file mode 100644
index 0000000000..500f1fd2d7
--- /dev/null
+++ b/packages/dotconf/files/srcMakefile.am_00.patch
@@ -0,0 +1,9 @@
+--- dotconf-1.0.13/src/Makefile.am.orig	2008-01-02 11:48:16.000000000 +0000
++++ dotconf-1.0.13/src/Makefile.am	2008-01-02 11:48:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-INCLUDES = -I. -I$(includedir)
++INCLUDES = -I.
+ 
+ include_HEADERS = dotconf.h
+ noinst_HEADERS = readdir.h
diff --git a/packages/navit/files/navit.desktop b/packages/navit/files/navit.desktop
new file mode 100644
index 0000000000..52aae31fce
--- /dev/null
+++ b/packages/navit/files/navit.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Navit
+Comment=GPS Navigation
+Exec=navit
+Icon=openmoko-terminal
+Terminal=false
+Type=Application
+Categories=GTK;Application;Utilities;
+MimeType=text/x-vcard;
+SingleInstance=true
+StartupNotify=true
diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb
index 35730e9fac..efb78e9967 100644
--- a/packages/navit/navit_0.0.3.bb
+++ b/packages/navit/navit_0.0.3.bb
@@ -1,8 +1,16 @@
 require navit.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
-	   file://navit.xml-so.patch;patch=1"
+	   file://navit.xml-so.patch;patch=1 \
+	   file://navit.desktop"
 
 EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+
+do_install_append() {
+	install -d ${D}/usr/share/applications/
+	
+	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
+}
+
diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb
index d35d9ddf56..30bc778e3b 100644
--- a/packages/navit/navit_cvs.bb
+++ b/packages/navit/navit_cvs.bb
@@ -1,14 +1,20 @@
 require navit.inc
 
 PV = "0.0.3+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/navit"
 
 SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
-           file://navit.xml-so.patch;patch=1"
+           file://navit.xml-so.patch;patch=1 \
+	   file://navit.desktop"
 
 EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
 
 EXTRA_AUTORECONF = " -I m4"
 
+do_install_append() {
+	install -d ${D}/usr/share/applications/
+	
+	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
+}
diff --git a/packages/speechd/speechd_0.56.bb b/packages/speechd/speechd_0.56.bb
deleted file mode 100644
index 3b58609e8d..0000000000
--- a/packages/speechd/speechd_0.56.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: speechd_0.56.bb
-# Date: 20071231 (YMD)
-
-DESCRIPTION = "speechd implements /dev/speech"
-HOMEPAGE = "http://www.speechio.org/"
-SECTION = "base"
-LICENSE = "GPL"
-
-PR = "r0"
-
-######################################################################################
-
-
-SRC_URI = "http://www.speechio.org/dl/speechd-${PV}.tar.gz"
-
-S = "${WORKDIR}/${PN}"
-
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	install -d ${D}/bin
-	install -d ${D}/etc
-	install -d ${D}/usr/share/man/man1
-	
-	install -m 0755 ${S}/bin/catspeech ${D}/bin/catspeech
-	install -m 0755 ${S}/bin/speechd ${D}/bin/speechd
-	
-	install -m 0644 ${S}/speechdrc ${D}/etc
-	
-	install -m 0644  ${S}/man/man1/catspeech.1 ${D}/usr/share/man/man1
-	install -m 0644  ${S}/man/man1/speechd.1 ${D}/usr/share/man/man1	
-}