[oe-commits] org.oe.dev merge of '6a31e37aafc15c89be73dccb95d7e0904e6c22c7'

mickeyl commit openembedded-commits at lists.openembedded.org
Tue Oct 23 11:24:10 UTC 2007 

merge of '6a31e37aafc15c89be73dccb95d7e0904e6c22c7'
     and 'd9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9719a8ead20aff09d9b8f2d80aff72670abba7c1
ViewMTN: http://monotone.openembedded.org/revision/info/9719a8ead20aff09d9b8f2d80aff72670abba7c1
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/bitbake.conf
conf/distro/angstrom-2007.1.conf
packages/openmoko2/openmoko-today2_svn.bb
packages/openmoko2/openmoko-dates2_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r6a31e37aafc15c89be73dccb95d7e0904e6c22c7 -r9719a8ead20aff09d9b8f2d80aff72670abba7c1
#
# 
# 
# 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/bitbake.conf"
#  from [f410a6b3af115612f2bd104814d1035583d3518a]
#    to [7223700020e755692ec209b6de23efdf0d5960cd]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [99f9b8aefa171947ca0486164ce4bbc39d40e700]
#    to [65949b96ffda674365178112dee75bfe8cf276c9]
# 
# patch "packages/openmoko2/openmoko-today2_svn.bb"
#  from [0e2736e19ed2076eb790631523b4a35e69882633]
#    to [bd706d0d3c24536774a11a9bbb330211c78759e8]
# 
============================================================
--- 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/bitbake.conf	f410a6b3af115612f2bd104814d1035583d3518a
+++ conf/bitbake.conf	7223700020e755692ec209b6de23efdf0d5960cd
@@ -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.
============================================================
--- 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
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb	0e2736e19ed2076eb790631523b4a35e69882633
+++ packages/openmoko2/openmoko-today2_svn.bb	bd706d0d3c24536774a11a9bbb330211c78759e8
@@ -1,8 +1,6 @@ SECTION = "openmoko/pim"
 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"


#
# mt diff -rd9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f -r9719a8ead20aff09d9b8f2d80aff72670abba7c1
#
# 
# 
# patch "packages/openmoko2/openmoko-dates2_svn.bb"
#  from [7abc97a523f717985d280fba2c7fd30cd7402605]
#    to [51a011a2d4123c8db6d9eb2d169e13715651d2dd]
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [8bf49f597b50d24a957ebe9e6f05404637ab6560]
#    to [0d9b673125099a19dc66faba6b28c9b8b9d3b631]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [1c897158060ef7883a4ea320c60d6475025ff4ef]
#    to [3142d9c5ee2a406f3f61b199443a3828c7acc136]
# 
# patch "packages/openmoko2/openmoko-today2_svn.bb"
#  from [f2ad7fa44fe0572781fdaf052a2dcaa318940c3a]
#    to [bd706d0d3c24536774a11a9bbb330211c78759e8]
# 
============================================================
--- packages/openmoko2/openmoko-dates2_svn.bb	7abc97a523f717985d280fba2c7fd30cd7402605
+++ packages/openmoko2/openmoko-dates2_svn.bb	51a011a2d4123c8db6d9eb2d169e13715651d2dd
@@ -1,6 +1,6 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Calendar"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus"
+DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
 RDEPENDS = "libedata-cal"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session	8bf49f597b50d24a957ebe9e6f05404637ab6560
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session	0d9b673125099a19dc66faba6b28c9b8b9d3b631
@@ -7,6 +7,6 @@ matchbox-panel-2 --start-applets systray
 matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
 
 matchbox-panel-2 --start-applets systray,startup \
-  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar &
+  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,keyboard --titlebar &
 
 exec neod
============================================================
--- packages/openmoko2/openmoko-session2.bb	1c897158060ef7883a4ea320c60d6475025ff4ef
+++ packages/openmoko2/openmoko-session2.bb	3142d9c5ee2a406f3f61b199443a3828c7acc136
@@ -1,16 +1,16 @@ RCONFLICTS = "openmoko-session"
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r34"
+PR = "r35"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
 
 do_install() {
-        install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}
 	cp -R ${S}/etc/* ${D}${sysconfdir}
 	rm -fR ${D}${sysconfdir}/.svn
 	rm -fR ${D}${sysconfdir}/matchbox/.svn
@@ -28,7 +28,7 @@ gconftool-2 --config-source=xml::$D${sys
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
-
+# gstreamer audio settings
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
 
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb	f2ad7fa44fe0572781fdaf052a2dcaa318940c3a
+++ packages/openmoko2/openmoko-today2_svn.bb	bd706d0d3c24536774a11a9bbb330211c78759e8
@@ -1,8 +1,8 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "openmoko-dates2 libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
+DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2 gtk-icon-cache

More information about the Openembedded-commits mailing list