Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/

into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/07 15:43:40+01:00 (none)!cwiiis
Stop gconf-dbus from breaking X log-in

BKrev: 4255473dWAlhae0P2zKNGRPdJw_Tmg

diff --git a/packages/gnome/gconf-dbus/69gconfd-dbus b/packages/gnome/gconf-dbus/69gconfd-dbus
index e69de29..c2add04 100644 (file)
--- a/packages/gnome/gconf-dbus/69gconfd-dbus
+++ b/packages/gnome/gconf-dbus/69gconfd-dbus
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/libexec/gconfd-2 &

diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
index b5d88f7..71ff770 100644 (file)
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ b/packages/gnome/gconf-dbus_cvs.bb
@@ -7,7 +7,7 @@ PROVIDES = "gconf"
 RPROVIDES = "gconf"
 
 PV = "0.0cvs${CVSDATE}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
            file://gconf-dbus-update.patch;patch=1;pnum=0 \