[oe-commits] org.oe.dev merge of '966130b6b30869c9981de21ad3a1f77b37e92adf'

Thu Jun 21 17:28:04 UTC 2007

merge of '966130b6b30869c9981de21ad3a1f77b37e92adf'
     and 'be71d5d419cf2691925b6df8c960264a219ea468'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 767f227d69ff905c612a340e4fa0bcc993f00158
ViewMTN: http://monotone.openembedded.org/revision.psp?id=767f227d69ff905c612a340e4fa0bcc993f00158
Files:
1
conf/distro/angstrom-2007.1.conf
packages/gnome/libgnomeui_2.12.0.bb
packages/gnome/libgnomeui_2.16.1.bb
packages/gpe-terminal/gpe-terminal_1.1.bb
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
packages/nfs-utils/files/nfsserver
packages/nfs-utils/nfs-utils_1.0.6.bb
packages/tasks/task-openmoko.bb
Diffs:

#
# mt diff -r966130b6b30869c9981de21ad3a1f77b37e92adf -r767f227d69ff905c612a340e4fa0bcc993f00158
#
# 
# no changes
# 


#
# mt diff -rbe71d5d419cf2691925b6df8c960264a219ea468 -r767f227d69ff905c612a340e4fa0bcc993f00158
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [0a417743ac330663af1be775a9b9e53e1b04f11f]
#    to [40ec0f16389a409c3592f71f501c78eba4f62dfa]
# 
# patch "packages/gnome/libgnomeui_2.12.0.bb"
#  from [9fa69e6ab24569d762e3f43a8aeb98fed2c3021c]
#    to [51afa0d04b49c96144d596d86d10c94e8d596520]
# 
# patch "packages/gnome/libgnomeui_2.16.1.bb"
#  from [20d8baaa7c7d1e7f2b9e84f91f368017d511202f]
#    to [5984d2f0e28a6312ea6b5f6befd1574c6ce2b2c9]
# 
# patch "packages/gpe-terminal/gpe-terminal_1.1.bb"
#  from [9e19a6d16f9c22c2350b2582799932792f5dfdbc]
#    to [189638530fe8a43e7977c8b8d76cd057a81aba2c]
# 
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
#  from [1ff55975dd2122b920dcb653eac1d92cdc808c0d]
#    to [98f6945666320e5fb6c32cb41be5353893c54de8]
# 
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
#  from [272892fa8a69f7cb3cc210d2d0936e8785271269]
#    to [138f2d5520ec3dc840562a758539b7d97bab7090]
# 
# patch "packages/nfs-utils/files/nfsserver"
#  from [d1430a843df0133ef759be701937c11fe50f951b]
#    to [750a23a4a6efb35c39276c247723e02f8f1cf704]
# 
# patch "packages/nfs-utils/nfs-utils_1.0.6.bb"
#  from [2bc2a9c0cbf8bcc2a3d436f4d62de3729988cafe]
#    to [84531b8c3c3b4f47046983445f2d6c185282134b]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [2d1ab02e9b16f1d970c935adfd45d4b4a890529e]
#    to [7ccc795bf3d89e590046cd65532bb1d96095822d]
# 
============================================================

--- conf/distro/angstrom-2007.1.conf	0a417743ac330663af1be775a9b9e53e1b04f11f
+++ conf/distro/angstrom-2007.1.conf	40ec0f16389a409c3592f71f501c78eba4f62dfa
@@ -124,6 +124,7 @@ PREFERRED_VERSION_gtk+ = "2.10.10"
 
 PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
 PREFERRED_VERSION_gtk+ = "2.10.10"
+PREFERRED_VERSION_libgnomeui = "2.16.1"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
============================================================
--- packages/gnome/libgnomeui_2.12.0.bb	9fa69e6ab24569d762e3f43a8aeb98fed2c3021c
+++ packages/gnome/libgnomeui_2.12.0.bb	51afa0d04b49c96144d596d86d10c94e8d596520
@@ -1,6 +1,6 @@ SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r2"
+PR = "r3"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
@@ -9,6 +9,9 @@ inherit gnome
 
 inherit gnome
 
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
+
 SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
 
 EXTRA_OECONF = "--disable-gtk-doc"
============================================================
--- packages/gnome/libgnomeui_2.16.1.bb	20d8baaa7c7d1e7f2b9e84f91f368017d511202f
+++ packages/gnome/libgnomeui_2.16.1.bb	5984d2f0e28a6312ea6b5f6befd1574c6ce2b2c9
@@ -1,6 +1,6 @@ SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
-PR = "r0"
+PR = "r1"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
@@ -11,6 +11,9 @@ inherit gnome
 
 inherit gnome
 
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
+
 SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
 
 EXTRA_OECONF = "--disable-gtk-doc"
@@ -20,5 +23,5 @@ do_stage() {
 }
 
 do_stage() {
-autotools_stage_all
+    autotools_stage_all
 }
============================================================
--- packages/gpe-terminal/gpe-terminal_1.1.bb	9e19a6d16f9c22c2350b2582799932792f5dfdbc
+++ packages/gpe-terminal/gpe-terminal_1.1.bb	189638530fe8a43e7977c8b8d76cd057a81aba2c
@@ -1,8 +1,11 @@
+DESCRIPTION = "GPE terminal wrapper"
 SECTION = "gpe"
-SRC_URI = "file://${PN}.desktop file://${PN}.png"
-DESCRIPTION = "GPE terminal wrapper"
-PV = "1.1"
 LICENSE = "GPL"
+RRECOMMENDS = "rxvt-unicode"
+PR = "r1"
+
+SRC_URI = "file://${PN}.desktop file://${PN}.png"
+
 do_install() {
 	install -d ${D}${datadir}/applications
 	install -d ${D}${datadir}/pixmaps
============================================================
--- packages/gpephone/gpe-session-scripts-phone/phonesession	1ff55975dd2122b920dcb653eac1d92cdc808c0d
+++ packages/gpephone/gpe-session-scripts-phone/phonesession	98f6945666320e5fb6c32cb41be5353893c54de8
@@ -48,5 +48,8 @@ gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 
 #cms92init &
 gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx &
 
-# Start PhoneServer
+#save session bus address to a file
+echo $DBUS_SESSION_BUS_ADDRESS > /tmp/dbusaddress
+
+# Start PhoneServer - do not stop, it keeps the session running
 phoneserver
============================================================
--- packages/gpephone/gpe-session-scripts-phone_0.67.bb	272892fa8a69f7cb3cc210d2d0936e8785271269
+++ packages/gpephone/gpe-session-scripts-phone_0.67.bb	138f2d5520ec3dc840562a758539b7d97bab7090
@@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scr
            file://phonesession \
 	   file://disable-composite.xsettings"
 
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"
 
============================================================
--- packages/nfs-utils/files/nfsserver	d1430a843df0133ef759be701937c11fe50f951b
+++ packages/nfs-utils/files/nfsserver	750a23a4a6efb35c39276c247723e02f8f1cf704
@@ -53,7 +53,7 @@ start_mountd(){
 #mountd
 start_mountd(){
 	echo -n 'starting mountd: '
-	start-stop-daemon --start --exec "$NFS_MOUNTD" -- "$@"
+	start-stop-daemon --start --exec "$NFS_MOUNTD" -- "-f /etc/exports $@"
 	echo done
 }
 stop_mountd(){
============================================================
--- packages/nfs-utils/nfs-utils_1.0.6.bb	2bc2a9c0cbf8bcc2a3d436f4d62de3729988cafe
+++ packages/nfs-utils/nfs-utils_1.0.6.bb	84531b8c3c3b4f47046983445f2d6c185282134b
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "userspace utilities for kernel nfs"
 PRIORITY = "optional"
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
 	file://acinclude-lossage.patch;patch=1 \
============================================================
--- packages/tasks/task-openmoko.bb	2d1ab02e9b16f1d970c935adfd45d4b4a890529e
+++ packages/tasks/task-openmoko.bb	7ccc795bf3d89e590046cd65532bb1d96095822d
@@ -5,7 +5,7 @@ PROVIDES = "task-openmoko-everything"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 
-PR = "r29"
+PR = "r30"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -19,7 +19,6 @@ PACKAGES = "\
   task-openmoko-demo \
   task-openmoko-examples \
   task-openmoko-debug \
-  task-openmoko-native-sdk \
 "
 
 RDEPENDS_task-openmoko-everything := "${PACKAGES}"
@@ -92,6 +91,8 @@ RDEPENDS_task-openmoko-ui = "\
   openmoko-common \
   openmoko-session \
   openmoko-theme-standard \
+  openmoko-icon-theme-standard \
+  settings-daemon \
 #  psplash \
 "
 
@@ -134,6 +135,7 @@ RDEPENDS_task-openmoko-pim = "\
   eds-dbus \
   openmoko-contacts \
   openmoko-dates \
+  openmoko-today \
 "
 
 #
@@ -166,7 +168,6 @@ RDEPENDS_task-openmoko-demo = "\
   openmoko-panel-gsm \
   openmoko-panel-mainmenu \
   xcursor-transparent-theme \
-  settings-daemon \
   web \
   rxvt-unicode \
   gpe-terminal \




