summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-10-01 12:07:41 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-10-01 12:07:41 +0000
commite3c1adf93f3805fbf64054232f0361f9974da4a2 (patch)
tree10dcf3d6637c6196c92e943d45019702df8b42ba
parentdb22fc8c9de2698cf3f57a3d1a260a6c5f5c602d (diff)
downloadopenembedded-e3c1adf93f3805fbf64054232f0361f9974da4a2.tar.gz
preferred-versions: Sync with .dev
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.6.inc3
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.7.inc4
-rw-r--r--conf/distro/include/preferred-gpe-versions.inc2
-rw-r--r--conf/distro/include/preferred-opie-versions.inc3
4 files changed, 11 insertions, 1 deletions
diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc
index 1d09ae6051..256bc0103f 100644
--- a/conf/distro/include/preferred-gpe-versions-2.6.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.6.inc
@@ -19,7 +19,9 @@ PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
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_xcursor-transparent-theme ?= "0.1.1"
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"
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 933195977d..56d9c5b059 100644
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -20,8 +20,9 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
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_xcursor-transparent-theme ?= "0.1.1"
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}"
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index 676e0ee9f9..e78888a02c 100644
--- a/conf/distro/include/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -17,7 +17,9 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
#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"
diff --git a/conf/distro/include/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc
index 51c9937628..34c1fd498e 100644
--- a/conf/distro/include/preferred-opie-versions.inc
+++ b/conf/distro/include/preferred-opie-versions.inc
@@ -65,6 +65,7 @@ PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
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-zkbapplet = "${OPIE_VERSION}"
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"