From 6baeede3c611e3301fa865bf38bf49bb3b0f8a3a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 13 Jan 2010 17:07:59 +0000 Subject: meta-moblin: Update to Moblin 2.1 released versions Signed-off-by: Richard Purdie --- .../conf/distro/include/moblin-fixed-revisions.inc | 29 ++++++++++++---- .../distro/include/moblin-floating-revisions.inc | 40 +++++++++++++++------- 2 files changed, 51 insertions(+), 18 deletions(-) (limited to 'meta-moblin/conf') diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc index 7f4f2b00bb..d0e4751706 100644 --- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc @@ -19,9 +19,26 @@ PREFERRED_VERSION_libx11-trim ?= "1.2.1" PREFERRED_VERSION_libdrm ?= "" PREFERRED_VERSION_xf86-input-keyboard ?= "" PREFERRED_VERSION_dri2proto ?= "" + + +PREFERRED_VERSION_anerley ?= "0.1.7" +PREFERRED_VERSION_bickley ?= "0.4" +PREFERRED_VERSION_bisho ?= "0.17.1" +PREFERRED_VERSION_bognor-regis ?= "0.5.0" PREFERRED_VERSION_carrick ?= "1.1.13" +PREFERRED_VERSION_dalston ?= "0.1.12" +PREFERRED_VERSION_gupnp-av ?= "0.4" +PREFERRED_VERSION_hornsey ?= "1.0" +PREFERRED_VERSION_mojito ?= "0.21.7" PREFERRED_VERSION_nbtk ?= "1.2.3" - +PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2" +PREFERRED_VERSION_moblin-panel-media ?= "0.0.7" +PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12" +PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2" +PREFERRED_VERSION_moblin-panel-people ?= "0.0.9" +PREFERRED_VERSION_moblin-panel-status ?= "0.0.9" +PREFERRED_VERSION_mutter ?= "2.28.1" +PREFERRED_VERSION_mutter-moblin ?= "0.43.8" SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892" @@ -38,7 +55,7 @@ SRCREV_pn-clutter-box2d ?= "2bcf5b836548dc4909e13b8ae7f60dc64c93d559" SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab" SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36" SRCREV_pn-clutter-imcontext ?= "2cb6f0ff153db639a489e58e36802e0e928b1968" -SRCREV_pn-clutter-mozembed ?= "5a5329425aec7fe7749e97fd8c430457259f6165" +SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751" SRCREV_pn-connman ?= "fd401dcd103a309e22c00d66f5c91375bfc9cce4" SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9" SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25" @@ -48,7 +65,7 @@ SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878" SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a" SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" -SRCREV_pn-librest ?= "ff4561e2a8c38f49127f6e3b2ce7c238a29e1571" +SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47" SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" SRCREV_pn-mobile-broadband-provider-info ?= "35ef359c591cccd99380225fa431855b16a12edc" SRCREV_pn-moblin-app-installer ?= "7f7d50079c8bcc63874fd60a61f23d849e025445" @@ -63,10 +80,10 @@ SRCREV_pn-moblin-panel-myzone ?= "54d9bee3a40a7700a69582a76aba89e213410046" SRCREV_pn-moblin-panel-pasteboard ?= "44411a4516e6ae22767662430fa37ed6a7d27a15" SRCREV_pn-moblin-panel-people ?= "0766282d120587919718b3bcb91553af1a1a00da" SRCREV_pn-moblin-panel-status ?= "fb10eaf16bbd064c12587ec8c734abe72a9841d3" -SRCREV_pn-moblin-web-browser ?= "a3ea71159bef93dc03762195bd5404a51db5e4a6" +SRCREV_pn-moblin-web-browser ?= "78ddd155cc297811720e4c4835d468ac6c4d9666" SRCREV_pn-mojito ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" -SRCREV_pn-mozilla-headless ?= "1a622cb7c384" -SRCREV_pn-mozilla-headless-services ?= "9091da493c679c546ec7312b653e63f9701d5c8f" +SRCREV_pn-mozilla-headless ?= "177d8b8bda61" +SRCREV_pn-mozilla-headless-services ?= "c679b95dd8c2807b70186d233b3833861a499315" SRCREV_pn-mutter ?= "c96345dd81176f171c2d15dd9d5c5b20f334f842" SRCREV_pn-mutter-moblin ?= "7a23e0d63cc31c12dab9de517de04b0ecf41b28a" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc index 999e0d1dfa..4594d48bac 100644 --- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc @@ -5,9 +5,13 @@ SRCREV_pn-bisho ?= "7b97cf8a9e2ef228be71e549e622df5d59869b39" SRCREV_pn-ashford ?= "${AUTOREV}" SRCREV_pn-anerley ?= "${AUTOREV}" +PREFERRED_VERSION_anerley ?= "0.1.7+git%" SRCREV_pn-bickley ?= "${AUTOREV}" +PREFERRED_VERSION_bickley ?= "0.4+git%" SRCREV_pn-bisho ?= "${AUTOREV}" +PREFERRED_VERSION_bisho ?= "0.17.1+git%" SRCREV_pn-bognor-regis ?= "${AUTOREV}" +PREFERRED_VERSION_bognor-regis ?= "0.5.0+git%" SRCREV_pn-carrick ?= "${AUTOREV}" PREFERRED_VERSION_carrick ?= "1.2.0+git%" SRCREV_pn-clutter ?= "${AUTOREV}" @@ -20,9 +24,12 @@ SRCREV_pn-connman ?= "${AUTOREV}" SRCREV_pn-connman-gnome ?= "${AUTOREV}" SRCREV_pn-contacts ?= "${AUTOREV}" SRCREV_pn-dalston ?= "${AUTOREV}" +PREFERRED_VERSION_dalston ?= "0.1.12+git%" SRCREV_pn-dates ?= "${AUTOREV}" SRCREV_pn-gconnman ?= "${AUTOREV}" +PREFERRED_VERSION_gupnp-av ?= "0.5.2" SRCREV_pn-hornsey ?= "${AUTOREV}" +PREFERRED_VERSION_hornsey ?= "1.0+git%" SRCREV_pn-json-glib ?= "${AUTOREV}" SRCREV_pn-libccss ?= "${AUTOREV}" SRCREV_pn-librest ?= "${AUTOREV}" @@ -36,16 +43,25 @@ SRCREV_pn-moblin-web-browser ?= "${AUTOREV}" SRCREV_pn-moblin-icon-theme ?= "${AUTOREV}" SRCREV_pn-moblin-user-skel ?= "${AUTOREV}" SRCREV_pn-moblin-panel-applications ?= "${AUTOREV}" +PREFERRED_VERSION_moblin-panel-applications ?= "0.1.2+git%" SRCREV_pn-moblin-panel-media ?= "${AUTOREV}" +PREFERRED_VERSION_moblin-panel-media ?= "0.0.7+git%" SRCREV_pn-moblin-panel-myzone ?= "${AUTOREV}" +PREFERRED_VERSION_moblin-panel-myzone ?= "0.0.12+git%" SRCREV_pn-moblin-panel-pasteboard ?= "${AUTOREV}" +PREFERRED_VERSION_moblin-panel-pasteboard ?= "0.0.2+git%" SRCREV_pn-moblin-panel-people ?= "${AUTOREV}" +PREFERRED_VERSION_moblin-panel-people ?= "0.0.9+git%" SRCREV_pn-moblin-panel-status ?= "${AUTOREV}" +PREFERRED_VERSION_moblin-panel-status ?= "0.0.9+git%" SRCREV_pn-mojito ?= "${AUTOREV}" +PREFERRED_VERSION_mojito ?= "0.21.7+git%" SRCREV_pn-mozilla-headless ?= "${AUTOREV}" SRCREV_pn-mozilla-headless-services ?= "${AUTOREV}" SRCREV_pn-mutter ?= "${AUTOREV}" +PREFERRED_VERSION_mutter ?= "2.28.1+git%" SRCREV_pn-mutter-moblin ?= "${AUTOREV}" +PREFERRED_VERSION_mutter-moblin ?= "0.43.8+git%" SRCREV_pn-mux ?= "${AUTOREV}" SRCREV_pn-nbtk ?= "${AUTOREV}" PREFERRED_VERSION_nbtk ?= "1.2.3+git% @@ -57,20 +73,20 @@ SRCREV_pn-tasks ?= "${AUTOREV}" SRCREV_pn-twitter-glib ?= "${AUTOREV}" SRCREV_pn-xf86-video-gma500 ?= "${AUTOREV}" -PREFERRED_VERSION_mesa-dri ?= "" -PREFERRED_VERSION_xf86-video-intel ?= "" -PREFERRED_VERSION_xserver-xf86-dri-lite ?= "" -PREFERRED_VERSION_libdrm ?= "" -PREFERRED_VERSION_xf86-input-keyboard ?= "" -PREFERRED_VERSION_dri2proto ?= "" -PREFERRED_VERSION_libx11-trim ?= "" -PREFERRED_VERSION_libxcb ?= "1.3" -PREFERRED_VERSION_xcb-proto ?= "1.5" - +SRCREV_pn-libdrm ?= "${AUTOREV}" +PREFERRED_VERSION_libdrm ?= "2.4.7+git%" +SRCREV_pn-mesa-dri ?= "${AUTOREV}" +PREFERRED_VERSION_mesa-dri ?= "7.5+git%" SRCREV_pn-xf86-video-intel ?= "${AUTOREV}" +PREFERRED_VERSION_xf86-video-intel ?= "2.7.1+git%" SRCREV_pn-xserver-xf86-dri-lite ?= "${AUTOREV}" -SRCREV_pn-mesa-dri ?= "${AUTOREV}" -SRCREV_pn-libdrm ?= "${AUTOREV}" +PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6+git%" SRCREV_pn-xf86-input-keyboard ?= "${AUTOREV}" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2+git%" SRCREV_pn-dri2proto ?= "${AUTOREV}" +PREFERRED_VERSION_dri2proto ?= "1.99.3+git%" SRCREV_pn-libx11-trim ?= "${AUTOREV}" +PREFERRED_VERSION_libx11-trim ?= "1.2.1+git%" + +PREFERRED_VERSION_libxcb ?= "1.3" +PREFERRED_VERSION_xcb-proto ?= "1.5" -- cgit v1.2.3-54-g00ecf