[oe-commits] org.oe.dev preferred-versions.inc: fix wrong preference for pango.

[mickeyl commit]

preferred-versions.inc: fix wrong preference for pango.
Guys, when you remove an old version of a package, make sure that
 a) no recipe directly depends on this version and
 b) no configuration sets PREFERRED_VERSION to this version.

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4569ccd3ba47dcb3b8065262d72969eb75349a14
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4569ccd3ba47dcb3b8065262d72969eb75349a14
Files:
1
conf/distro/include/maemo-preferred.inc
conf/distro/include/preferred-gpe-versions-2.6.inc
conf/distro/include/preferred-gpe-versions-2.7.inc
conf/distro/include/preferred-gpe-versions.inc
Diffs:

#
# mt diff -r7a2e7b04a5edc5105d25f6a5e46ebacb7453ec1f -r4569ccd3ba47dcb3b8065262d72969eb75349a14
#
# 
# 
# patch "conf/distro/include/maemo-preferred.inc"
#  from [b26c58a059a53935e59e2ebd9b41a26c570b0e56]
#    to [143e203174c057cb485392e449dada1847f28c79]
# 
# patch "conf/distro/include/preferred-gpe-versions-2.6.inc"
#  from [9c3ee408cc6b39f59856c6e86add70cd36c56cb8]
#    to [87d8a1bfa0107451e8eba0df8cda74894124f801]
# 
# patch "conf/distro/include/preferred-gpe-versions-2.7.inc"
#  from [8a7ef8656eac70de11117456f1da34a05678b2bd]
#    to [7868a3295c4fdb92fb45e6594c63c406ccf0f68a]
# 
# patch "conf/distro/include/preferred-gpe-versions.inc"
#  from [9e5c5a32cd160c64713baefa2835a5f4a404db39]
#    to [5c1e74a1d5bdbda8949a0b5f7b1abce7aff3faa0]
# 
============================================================
--- conf/distro/include/maemo-preferred.inc	b26c58a059a53935e59e2ebd9b41a26c570b0e56
+++ conf/distro/include/maemo-preferred.inc	143e203174c057cb485392e449dada1847f28c79
@@ -5,6 +5,6 @@ PREFERRED_VERSION_glib-2.0 = "2.6.4"
 PREFERRED_PROVIDER_esd = "osso-esd"
 PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
 PREFERRED_VERSION_glib-2.0 = "2.6.4"
-PREFERRED_VERSION_pango = "1.8.1"
+PREFERRED_VERSION_pango = "1.8.2"
 PREFERRED_VERSION_atk = "1.9.0"
 PREFERRED_VERSION_diet-x11 ?= "6.2.1"
============================================================
--- conf/distro/include/preferred-gpe-versions-2.6.inc	9c3ee408cc6b39f59856c6e86add70cd36c56cb8
+++ conf/distro/include/preferred-gpe-versions-2.6.inc	87d8a1bfa0107451e8eba0df8cda74894124f801
@@ -19,6 +19,7 @@ PREFERRED_VERSION_matchbox-applet-inputm
 PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_pango ?= "1.8.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.3"
 PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.97"
============================================================
--- conf/distro/include/preferred-gpe-versions-2.7.inc	8a7ef8656eac70de11117456f1da34a05678b2bd
+++ conf/distro/include/preferred-gpe-versions-2.7.inc	7868a3295c4fdb92fb45e6594c63c406ccf0f68a
@@ -20,9 +20,9 @@ PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
 PREFERRED_VERSION_atk ?= "1.9.0"
 PREFERRED_VERSION_cairo ?= "0.5.2"
 PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
+PREFERRED_VERSION_pango ?= "1.8.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.10"
 PREFERRED_VERSION_gtk-engines ?= "2.6.5"
-PREFERRED_VERSION_pango ?= "1.8.1"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.109"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
============================================================
--- conf/distro/include/preferred-gpe-versions.inc	9e5c5a32cd160c64713baefa2835a5f4a404db39
+++ conf/distro/include/preferred-gpe-versions.inc	5c1e74a1d5bdbda8949a0b5f7b1abce7aff3faa0
@@ -17,6 +17,7 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-d
 #PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
 #PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
 #PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+#PREFERRED_VERSION_pango ?= "1.8.2"
 #PREFERRED_VERSION_gtk+ ?= "2.6.3"
 #PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 #PREFERRED_VERSION_libgpewidget ?= "0.97"