[oe-commits] org.oe.dev merge of '390299321610f6481d96301ddfd5203940dda8a1'

[oe commit]

merge of '390299321610f6481d96301ddfd5203940dda8a1'
     and '5c1f800d5a3c66b86677c20801619331b7bc3b4c'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 53cc62f49c8608e5ffa07ac066958e28d5113f8e
ViewMTN: http://monotone.openembedded.org/revision/info/53cc62f49c8608e5ffa07ac066958e28d5113f8e
Files:
1
packages/grdesktop
packages/grdesktop/grdesktop-0.23
packages/grdesktop/grdesktop-0.23/fr.po.patch
packages/grdesktop/grdesktop-0.23/install-help.patch
packages/grdesktop/grdesktop_0.23.bb
conf/distro/angstrom-2007.1.conf
packages/openmoko2/openmoko-today2_svn.bb
Diffs:

#
# mt diff -r390299321610f6481d96301ddfd5203940dda8a1 -r53cc62f49c8608e5ffa07ac066958e28d5113f8e
#
# 
# 
# add_dir "packages/grdesktop"
# 
# add_dir "packages/grdesktop/grdesktop-0.23"
# 
# add_file "packages/grdesktop/grdesktop-0.23/fr.po.patch"
#  content [5c4dc9a83fbb35a2dce0ee2f9fa1c7af925dc960]
# 
# add_file "packages/grdesktop/grdesktop-0.23/install-help.patch"
#  content [334ad5006db33fcb62a7da3bdf40bb4a242a5385]
# 
# add_file "packages/grdesktop/grdesktop_0.23.bb"
#  content [fe223775e1264037b8ea322322934800c3985844]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [99f9b8aefa171947ca0486164ce4bbc39d40e700]
#    to [65949b96ffda674365178112dee75bfe8cf276c9]
# 
============================================================
--- packages/grdesktop/grdesktop-0.23/fr.po.patch	5c4dc9a83fbb35a2dce0ee2f9fa1c7af925dc960
+++ packages/grdesktop/grdesktop-0.23/fr.po.patch	5c4dc9a83fbb35a2dce0ee2f9fa1c7af925dc960
@@ -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 at laposte."
+ "net>\n"
+-"Language-Team: LANGUAGE <LL at li.org>\n"
++"Language-Team: French <LL at li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
============================================================
--- packages/grdesktop/grdesktop-0.23/install-help.patch	334ad5006db33fcb62a7da3bdf40bb4a242a5385
+++ packages/grdesktop/grdesktop-0.23/install-help.patch	334ad5006db33fcb62a7da3bdf40bb4a242a5385
@@ -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)
+ 
============================================================
--- packages/grdesktop/grdesktop_0.23.bb	fe223775e1264037b8ea322322934800c3985844
+++ packages/grdesktop/grdesktop_0.23.bb	fe223775e1264037b8ea322322934800c3985844
@@ -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
+
============================================================
--- conf/distro/angstrom-2007.1.conf	99f9b8aefa171947ca0486164ce4bbc39d40e700
+++ conf/distro/angstrom-2007.1.conf	65949b96ffda674365178112dee75bfe8cf276c9
@@ -71,7 +71,7 @@ PREFERRED_VERSION_pango            = "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


#
# mt diff -r5c1f800d5a3c66b86677c20801619331b7bc3b4c -r53cc62f49c8608e5ffa07ac066958e28d5113f8e
#
# 
# 
# patch "packages/openmoko2/openmoko-today2_svn.bb"
#  from [55ff756ef8b39d10085d43cd190a0695963fd78a]
#    to [f2ad7fa44fe0572781fdaf052a2dcaa318940c3a]
# 
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb	55ff756ef8b39d10085d43cd190a0695963fd78a
+++ packages/openmoko2/openmoko-today2_svn.bb	f2ad7fa44fe0572781fdaf052a2dcaa318940c3a
@@ -1,6 +1,6 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
+DEPENDS = "openmoko-dates2 libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"