From: Ross Burton <ross@openedhand.com>
Date: Tue, 19 Jun 2007 07:43:49 +0000 (+0000)
Subject: Upgrade to DBus 1.0.2
X-Git-Tag: 2011-1~11439
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9f594e2d33d807b27e4bfbc00a0624d67f129169;p=openembedded-core.git

Upgrade to DBus 1.0.2

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1974 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index b8af874b05..d12565b7bc 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -143,8 +143,8 @@ PREFERRED_VERSION_cairo ?= "1.2.4"
 PREFERRED_VERSION_pango ?= "1.10.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.10"
 
-PREFERRED_VERSION_dbus ?= "1.0.1"
-PREFERRED_VERSION_dbus-native ?= "1.0.1"
+PREFERRED_VERSION_dbus ?= "1.0.2"
+PREFERRED_VERSION_dbus-native ?= "1.0.2"
 PREFERRED_VERSION_dbus-glib ?= "0.72"
 PREFERRED_VERSION_dbus-glib-native ?= "0.72"
 PREFERRED_VERSION_gnome-vfs ?= "2.16.3"
diff --git a/meta/packages/dbus/dbus-1.0.1/cross.patch b/meta/packages/dbus/dbus-1.0.2/cross.patch
similarity index 100%
rename from meta/packages/dbus/dbus-1.0.1/cross.patch
rename to meta/packages/dbus/dbus-1.0.2/cross.patch
diff --git a/meta/packages/dbus/dbus-1.0.1/dbus-1.init b/meta/packages/dbus/dbus-1.0.2/dbus-1.init
similarity index 100%
rename from meta/packages/dbus/dbus-1.0.1/dbus-1.init
rename to meta/packages/dbus/dbus-1.0.2/dbus-1.init
diff --git a/meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
similarity index 100%
rename from meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch
rename to meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
diff --git a/meta/packages/dbus/dbus-native_1.0.1.bb b/meta/packages/dbus/dbus-native_1.0.2.bb
similarity index 99%
rename from meta/packages/dbus/dbus-native_1.0.1.bb
rename to meta/packages/dbus/dbus-native_1.0.2.bb
index 1176a56ef6..72e2190f78 100644
--- a/meta/packages/dbus/dbus-native_1.0.1.bb
+++ b/meta/packages/dbus/dbus-native_1.0.2.bb
@@ -9,7 +9,7 @@ DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
 DEFAULT_PREFERENCE = "-1"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.1"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
 	   "
diff --git a/meta/packages/dbus/dbus_1.0.1.bb b/meta/packages/dbus/dbus_1.0.2.bb
similarity index 100%
rename from meta/packages/dbus/dbus_1.0.1.bb
rename to meta/packages/dbus/dbus_1.0.2.bb