diff options
author | Chris Lord <chris@openedhand.com> | 2005-04-07 14:44:13 +0000 |
---|---|---|
committer | Chris Lord <chris@openedhand.com> | 2005-04-07 14:44:13 +0000 |
commit | 8cdf148d35cf1503f4cebb18f987d8577bab43cc (patch) | |
tree | 4b003f4e765d2c2948cd373383b2c7d67dce0280 | |
parent | 4262ea59a72ae3ff0f2a78bbe6136b41a0d1a3e2 (diff) |
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
-rw-r--r-- | packages/gnome/gconf-dbus/69gconfd-dbus | 3 | ||||
-rw-r--r-- | packages/gnome/gconf-dbus_cvs.bb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/gnome/gconf-dbus/69gconfd-dbus b/packages/gnome/gconf-dbus/69gconfd-dbus index e69de29bb2..c2add042f6 100644 --- 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 b5d88f7e59..71ff770f52 100644 --- 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 \ |