[oe-commits] org.oe.packaged-staging preferred-versions: Sync with .dev

[rpurdie commit]

preferred-versions: Sync with .dev

Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: e313f7ce7daac69a6356cdd029c16c234202148a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e313f7ce7daac69a6356cdd029c16c234202148a
Files:
1
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
conf/distro/include/preferred-opie-versions.inc
Diffs:

#
# mt diff -r2d366fee17415b64b1ca48266bbae01f1f306f00 -re313f7ce7daac69a6356cdd029c16c234202148a
#
# 
# 
# patch "conf/distro/include/preferred-gpe-versions-2.6.inc"
#  from [31f25c42c566219d686d9e7840c3459ef6d91168]
#    to [87d8a1bfa0107451e8eba0df8cda74894124f801]
# 
# patch "conf/distro/include/preferred-gpe-versions-2.7.inc"
#  from [333a704901ad921d494106265c2b1e548d1141da]
#    to [7868a3295c4fdb92fb45e6594c63c406ccf0f68a]
# 
# patch "conf/distro/include/preferred-gpe-versions.inc"
#  from [f081a047566287accacf0a51d5e3da9d69e11e76]
#    to [5c1e74a1d5bdbda8949a0b5f7b1abce7aff3faa0]
# 
# patch "conf/distro/include/preferred-opie-versions.inc"
#  from [19458b686ee2bcf01a16bd4a43f230ec50cbf754]
#    to [69ded9e29533038ccdf141d4bc39a7c4e6cabc46]
# 
============================================================
--- conf/distro/include/preferred-gpe-versions-2.6.inc	31f25c42c566219d686d9e7840c3459ef6d91168
+++ conf/distro/include/preferred-gpe-versions-2.6.inc	87d8a1bfa0107451e8eba0df8cda74894124f801
@@ -19,7 +19,9 @@ 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"
 PREFERRED_VERSION_libgpepimc ?= "0.4"
 PREFERRED_VERSION_libgpevtype ?= "0.11"
@@ -32,6 +34,7 @@ PREFERRED_VERSION_xst ?= "0.14"
 PREFERRED_VERSION_rxvt-unicode ?= "5.3"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_xst ?= "0.14"
+PREFERRED_PROVIDER_xextensions = "xextensions"
 #PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
 PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
============================================================
--- conf/distro/include/preferred-gpe-versions-2.7.inc	333a704901ad921d494106265c2b1e548d1141da
+++ conf/distro/include/preferred-gpe-versions-2.7.inc	7868a3295c4fdb92fb45e6594c63c406ccf0f68a
@@ -20,8 +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_pango ?= "1.8.1"
+PREFERRED_VERSION_gtk-engines ?= "2.6.5"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.109"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
@@ -37,6 +38,7 @@ PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_xst ?= "0.15"
+PREFERRED_PROVIDER_xextensions = "xextensions"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
 PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
 PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
============================================================
--- conf/distro/include/preferred-gpe-versions.inc	f081a047566287accacf0a51d5e3da9d69e11e76
+++ conf/distro/include/preferred-gpe-versions.inc	5c1e74a1d5bdbda8949a0b5f7b1abce7aff3faa0
@@ -17,7 +17,9 @@ 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"
 #PREFERRED_VERSION_libgpepimc ?= "0.4"
 #PREFERRED_VERSION_libgpevtype ?= "0.11"
============================================================
--- conf/distro/include/preferred-opie-versions.inc	19458b686ee2bcf01a16bd4a43f230ec50cbf754
+++ conf/distro/include/preferred-opie-versions.inc	69ded9e29533038ccdf141d4bc39a7c4e6cabc46
@@ -65,6 +65,7 @@ PREFERRED_VERSION_opie-examples-python =
 PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
@@ -203,4 +204,6 @@ PREFERRED_VERSION_opie-zsame = "${OPIE_V
 PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
 PREFERRED_VERSION_konqueror-embedded = "20060404"