diff options
author | Ross Burton <ross@openedhand.com> | 2007-08-31 14:53:40 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2007-08-31 14:53:40 +0000 |
commit | 8cc540dc14f721ab4d8ba0e7e97a9ca2e9b8e8fe (patch) | |
tree | 8a573c9df1f365f1a9e77dc187f2e2ff87a0da27 /meta/conf | |
parent | 3d0b9fc1db780120eefd83240fff21f6847a35bb (diff) | |
download | poky-8cc540dc14f721ab4d8ba0e7e97a9ca2e9b8e8fe.tar.gz |
Upgrade pango to latest stable release, 1.18.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2611 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/poky-bleeding.conf | 1 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 0b59df5823..921545f288 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf | |||
@@ -1,4 +1,3 @@ | |||
1 | PREFERRED_VERSION_pango ?= "1.17.5" | ||
2 | PREFERRED_VERSION_gtk+ ?= "2.11.6" | 1 | PREFERRED_VERSION_gtk+ ?= "2.11.6" |
3 | 2 | ||
4 | require conf/distro/poky.conf | 3 | require conf/distro/poky.conf |
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 4c3a0c3074..4daeaee23f 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -159,7 +159,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.14.0" | |||
159 | PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" | 159 | PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" |
160 | PREFERRED_VERSION_atk ?= "1.18.0" | 160 | PREFERRED_VERSION_atk ?= "1.18.0" |
161 | PREFERRED_VERSION_cairo ?= "1.4.10" | 161 | PREFERRED_VERSION_cairo ?= "1.4.10" |
162 | PREFERRED_VERSION_pango ?= "1.16.5" | 162 | PREFERRED_VERSION_pango ?= "1.18.1" |
163 | PREFERRED_VERSION_gtk+ ?= "2.10.14" | 163 | PREFERRED_VERSION_gtk+ ?= "2.10.14" |
164 | 164 | ||
165 | PREFERRED_VERSION_dbus ?= "1.0.2" | 165 | PREFERRED_VERSION_dbus ?= "1.0.2" |