]> git.openpandora.org Git - openembedded.git/commitdiff
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
authorChris Lord <chris@openedhand.com>
Thu, 7 Apr 2005 14:44:13 +0000 (14:44 +0000)
committerChris Lord <chris@openedhand.com>
Thu, 7 Apr 2005 14:44:13 +0000 (14:44 +0000)
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

packages/gnome/gconf-dbus/69gconfd-dbus
packages/gnome/gconf-dbus_cvs.bb

index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c2add042f6920c6858422f4656715a8c95c4be0c 100644 (file)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/libexec/gconfd-2 &
index b5d88f7e5977f317445ebac173dce4a4f11484a1..71ff770f526723df3b45dff53e8f6c3a7a35efd8 100644 (file)
@@ -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 \