From: Ross Burton <ross@openedhand.com>
Date: Fri, 31 Aug 2007 14:53:40 +0000 (+0000)
Subject: Upgrade pango to latest stable release, 1.18.2
X-Git-Tag: 2011-1~10808
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8cc540dc14f721ab4d8ba0e7e97a9ca2e9b8e8fe;p=openembedded-core.git

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
---

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 @@
-PREFERRED_VERSION_pango ?= "1.17.5"
 PREFERRED_VERSION_gtk+ ?= "2.11.6"
 
 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"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 PREFERRED_VERSION_atk ?= "1.18.0"
 PREFERRED_VERSION_cairo ?= "1.4.10"
-PREFERRED_VERSION_pango ?= "1.16.5"
+PREFERRED_VERSION_pango ?= "1.18.1"
 PREFERRED_VERSION_gtk+ ?= "2.10.14"
 
 PREFERRED_VERSION_dbus ?= "1.0.2"
diff --git a/meta/packages/pango/pango-1.17.5/no-tests.patch b/meta/packages/pango/pango-1.18.1/no-tests.patch
similarity index 100%
rename from meta/packages/pango/pango-1.17.5/no-tests.patch
rename to meta/packages/pango/pango-1.18.1/no-tests.patch
diff --git a/meta/packages/pango/pango_1.17.5.bb b/meta/packages/pango/pango_1.18.1.bb
similarity index 100%
rename from meta/packages/pango/pango_1.17.5.bb
rename to meta/packages/pango/pango_1.18.1.bb