[oe-commits] Thomas Zimmermann : shr/merge: use new gconf instead of gconf-dbus and use preferred cairo version from angstrom

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 7cf2f4968d6210b322e06c5c87979a6254b3f500
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7cf2f4968d6210b322e06c5c87979a6254b3f500

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Fri Oct 23 19:43:31 2009 +0000

shr/merge: use new gconf instead of gconf-dbus and use preferred cairo version from angstrom

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/preferred-shr-versions.inc |    3 ---
 conf/distro/shr.conf                           |    1 +
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 6245fd7..c57fcf2 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -118,7 +118,6 @@ PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515"
 PREFERRED_VERSION_bzip2 ?= "1.0.2"
 PREFERRED_VERSION_cacao-cldc ?= "0.98"
 PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98"
-PREFERRED_VERSION_cairo ?= "1.8.0"
 PREFERRED_VERSION_cairo-directfb ?= "1.4.8"
 PREFERRED_VERSION_cairomm ?= "1.2.4"
 PREFERRED_VERSION_calc ?= "0.0.1"
@@ -400,8 +399,6 @@ PREFERRED_VERSION_gammu ?= "1.17.0"
 PREFERRED_VERSION_gawk ?= "3.1.4"
 PREFERRED_VERSION_gawk-native ?= "3.1.4"
 PREFERRED_VERSION_gcalctool ?= "5.7.32"
-PREFERRED_VERSION_gconf ?= "2.6.1"
-PREFERRED_VERSION_gconf-native ?= "2.6.1"
 PREFERRED_VERSION_gd ?= "2.0.33"
 PREFERRED_VERSION_gdado ?= "2.2"
 PREFERRED_VERSION_gdal ?= "1.3.2"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 546da82..6aa6021 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -55,6 +55,7 @@ PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
 
+PREFERRED_PROVIDER_gconf = "gconf"
 PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-simple"
 PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
 PREFERRED_PROVIDER_gpsd = "fso-gpsd"