merge of '6a31e37aafc15c89be73dccb95d7e0904e6c22c7'

     and 'd9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f'

8 files changed, 48 insertions, 6 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 046b107936..43e45bd87d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -460,9 +460,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
 #
 # This works for  functions as well, they are really just environment variables.
-#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
-# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
+# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
 OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+# Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains.
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}"
 
 ##################################################################
 # Include the rest of the config files.
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 00fa645c5e..1f2961f3a1 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -71,7 +71,7 @@ PREFERRED_VERSION_freetype-native  = "2.2.1"
 PREFERRED_VERSION_cairo            = "1.4.10"
 PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
-PREFERRED_VERSION_atk              = "1.10.3"
+PREFERRED_VERSION_atk              = "1.20.0"
 PREFERRED_VERSION_gtk+             = "2.10.14"
 
 # newer poppler cvs breaks some apps, fix until popper 6 and apps
diff --git a/packages/grdesktop/.mtn2git_empty b/packages/grdesktop/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/grdesktop/.mtn2git_empty
diff --git a/packages/grdesktop/grdesktop-0.23/.mtn2git_empty b/packages/grdesktop/grdesktop-0.23/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/grdesktop/grdesktop-0.23/.mtn2git_empty
diff --git a/packages/grdesktop/grdesktop-0.23/fr.po.patch b/packages/grdesktop/grdesktop-0.23/fr.po.patch
new file mode 100644
index 0000000000..bd36d46ae6
--- /dev/null
+++ b/packages/grdesktop/grdesktop-0.23/fr.po.patch
@@ -0,0 +1,11 @@
+--- /po/orig-fr.po	2004-03-04 13:22:07.000000000 +0200
++++ /po/fr.po	2007-10-23 11:56:53.000000000 +0300
+@@ -12,7 +12,7 @@
+ "PO-Revision-Date: 2002-11-13 16:30+0200\n"
+ "Last-Translator: Jean-Francois Kubitowicz <jean-francois.kubitowicz@laposte."
+ "net>\n"
+-"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language-Team: French <LL@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/packages/grdesktop/grdesktop-0.23/install-help.patch b/packages/grdesktop/grdesktop-0.23/install-help.patch
new file mode 100644
index 0000000000..8aac6f8afc
--- /dev/null
+++ b/packages/grdesktop/grdesktop-0.23/install-help.patch
@@ -0,0 +1,11 @@
+--- /help/C/orig-Makefile.am	2004-03-30 16:56:57.000000000 +0300
++++ /help/C/Makefile.am	2007-10-23 12:22:10.000000000 +0300
+@@ -40,7 +40,7 @@
+ install-data-hook-omf:
+ 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ 	for file in $(extraomf); do \
+-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		$(INSTALL_DATA) $$file $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	done
+ 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 
diff --git a/packages/grdesktop/grdesktop_0.23.bb b/packages/grdesktop/grdesktop_0.23.bb
new file mode 100644
index 0000000000..a87e9fbeac
--- /dev/null
+++ b/packages/grdesktop/grdesktop_0.23.bb
@@ -0,0 +1,21 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+DESCRIPTION = "grdesktop is a GNOME frontend, for the remote desktop client (rdesktop)."
+HOMEPAGE = "http://www.nongnu.org/grdesktop/index.html"
+SECTION = "x11/utils"
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk+ libgnomeui"
+RDEPENDS ="rdesktop"
+
+PR = "r0"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/grdesktop/grdesktop-${PV}.tar.gz \
+           file://fr.po.patch;patch=1 \
+           file://install-help.patch;patch=1"
+      
+
+S = "${WORKDIR}/grdesktop-${PV}"
+
+inherit autotools pkgconfig
+
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index b2af835aee..998d22e308 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,8 +1,6 @@
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
-# for libjana (which should be a seperate bbfile soon)
-DEPENDS += "openmoko-dates2"
+DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r2"