[oe-commits] org.oe.dev merge of '020c739f7c1a16fae0869fe497a45111441783d3'

[pfalcon commit]

merge of '020c739f7c1a16fae0869fe497a45111441783d3'
     and '97df34dbfe924823e092b0d579539be286af6cea'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 50f3f055331d809843a6aaa94270a346964d2ca9
ViewMTN: http://monotone.openembedded.org/revision/info/50f3f055331d809843a6aaa94270a346964d2ca9
Files:
1
packages/gpe-login/files/c-locale.patch
packages/gpe-login/gpe-login_0.90.bb
packages/speechd
packages/speechd/speechd_0.56.bb
packages/dotconf
packages/dotconf/files
packages/dotconf/dotconf_1.0.13.bb
packages/dotconf/files/srcMakefile.am_00.patch
packages/navit/files/navit.desktop
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
Diffs:

#
# mt diff -r020c739f7c1a16fae0869fe497a45111441783d3 -r50f3f055331d809843a6aaa94270a346964d2ca9
#
# 
# 
# add_file "packages/gpe-login/files/c-locale.patch"
#  content [bd0c78f858995bf0b287089ef71c5eb95dce42d0]
# 
# patch "packages/gpe-login/gpe-login_0.90.bb"
#  from [bc03131b857f9acf77c76c941a580713ef8e1ac5]
#    to [754b8ebf57e141bd2c3f322d2ad71fb0a4c0c827]
# 
============================================================
--- packages/gpe-login/files/c-locale.patch	bd0c78f858995bf0b287089ef71c5eb95dce42d0
+++ packages/gpe-login/files/c-locale.patch	bd0c78f858995bf0b287089ef71c5eb95dce42d0
@@ -0,0 +1,11 @@
+--- a/gpe-login.c.org	2007-11-29 16:11:53.000000000 +0200
++++ a/gpe-login.c	2008-01-02 20:13:27.000000000 +0200
+@@ -1180,7 +1180,7 @@
+   language_menu = gtk_option_menu_new ();
+ 
+   c_locale = g_malloc (sizeof (locale_item_t));
+-  c_locale->name = "English";
++  c_locale->name = "English(C locale)";
+   c_locale->locale = "C";
+   locale_system_list = g_slist_append (NULL, c_locale);
+ 
============================================================
--- packages/gpe-login/gpe-login_0.90.bb	bc03131b857f9acf77c76c941a580713ef8e1ac5
+++ packages/gpe-login/gpe-login_0.90.bb	754b8ebf57e141bd2c3f322d2ad71fb0a4c0c827
@@ -5,7 +5,7 @@ RPROVIDES_${PN} = "gpe-session-starter"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd gpe-theme-clearlooks"
 RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r5"
+PR = "r6"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
@@ -19,6 +19,7 @@ SRC_URI += " file://size-autolock-proper
 SRC_URI += " file://lock-on-supend.patch;patch=1 "
 SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
 SRC_URI += " file://size-autolock-properly.patch;patch=1 "
+SRC_URI += " file://c-locale.patch;patch=1 "
 
 SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"


#
# mt diff -r97df34dbfe924823e092b0d579539be286af6cea -r50f3f055331d809843a6aaa94270a346964d2ca9
#
# 
# 
# delete "packages/speechd"
# 
# delete "packages/speechd/speechd_0.56.bb"
# 
# add_dir "packages/dotconf"
# 
# add_dir "packages/dotconf/files"
# 
# add_file "packages/dotconf/dotconf_1.0.13.bb"
#  content [e67a233b6b36af1e1166969497a8065fc964af7b]
# 
# add_file "packages/dotconf/files/srcMakefile.am_00.patch"
#  content [7cf891b5ee3b478c01d747bf23bb96cf877712cc]
# 
# add_file "packages/navit/files/navit.desktop"
#  content [abe450116dc6bb7263347dd948f736d0e612f95e]
# 
# patch "packages/navit/navit_0.0.3.bb"
#  from [45cadbb58c918bee75079075b7ef9d209507941e]
#    to [bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0]
# 
# patch "packages/navit/navit_cvs.bb"
#  from [68ae9f449982f15699c5e966c7d4cd4b8ccd2f73]
#    to [537deb351fc223dc40a33d489f2edf10bd7f67dd]
# 
============================================================
--- packages/dotconf/dotconf_1.0.13.bb	e67a233b6b36af1e1166969497a8065fc964af7b
+++ packages/dotconf/dotconf_1.0.13.bb	e67a233b6b36af1e1166969497a8065fc964af7b
@@ -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}/
+}
============================================================
--- packages/dotconf/files/srcMakefile.am_00.patch	7cf891b5ee3b478c01d747bf23bb96cf877712cc
+++ packages/dotconf/files/srcMakefile.am_00.patch	7cf891b5ee3b478c01d747bf23bb96cf877712cc
@@ -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
============================================================
--- packages/navit/files/navit.desktop	abe450116dc6bb7263347dd948f736d0e612f95e
+++ packages/navit/files/navit.desktop	abe450116dc6bb7263347dd948f736d0e612f95e
@@ -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
============================================================
--- packages/navit/navit_0.0.3.bb	45cadbb58c918bee75079075b7ef9d209507941e
+++ packages/navit/navit_0.0.3.bb	bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0
@@ -1,8 +1,16 @@ require navit.inc
 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/
+}
+
============================================================
--- packages/navit/navit_cvs.bb	68ae9f449982f15699c5e966c7d4cd4b8ccd2f73
+++ packages/navit/navit_cvs.bb	537deb351fc223dc40a33d489f2edf10bd7f67dd
@@ -1,14 +1,20 @@ PV = "0.0.3+cvs${SRCDATE}"
 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/
+}