merge of 'aa36aa92826b8f74328b39933671dd201b795054'

     and 'bc72cbe491bc556448f73971b4b962b9a60c9dd9'

7 files changed, 12 insertions, 59 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index bfb6301a19..12158f85ad 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -115,8 +115,6 @@ PREFERRED_VERSION_bison-native ?= "2.0"
 PREFERRED_VERSION_bitbake ?= "1.8.6"
 PREFERRED_VERSION_bitchx ?= "1.1"
 PREFERRED_VERSION_bl ?= "0.0"
-PREFERRED_VERSION_blassic ?= "0.10.1"
-PREFERRED_VERSION_blktool ?= "4"
 PREFERRED_VERSION_blueprobe ?= "0.18"
 PREFERRED_VERSION_bluesnarfer ?= "0.1"
 PREFERRED_VERSION_bluez-cups-backend ?= "3.20"
@@ -400,8 +398,6 @@ PREFERRED_VERSION_essential-image ?= "1.0"
 PREFERRED_VERSION_essential-machine-image ?= "1.0"
 PREFERRED_VERSION_etherpuppet ?= "0.2"
 PREFERRED_VERSION_ethload ?= "1.2"
-PREFERRED_VERSION_ethload-native ?= "1.2"
-PREFERRED_VERSION_ethtool ?= "6"
 PREFERRED_VERSION_etk ?= "0.1.0"
 PREFERRED_VERSION_etk-native ?= "0.1.0"
 PREFERRED_VERSION_ettercap ?= "0.6.b"
@@ -816,7 +812,6 @@ PREFERRED_VERSION_hsetroot ?= "1.0.2"
 PREFERRED_VERSION_htb-init ?= "0.8.5"
 PREFERRED_VERSION_httppc ?= "0.8.5"
 PREFERRED_VERSION_htun ?= "0.9.5"
-PREFERRED_VERSION_hugs ?= "hugs98-Nov2003"
 PREFERRED_VERSION_hvsc ?= "45"
 PREFERRED_VERSION_hwdata ?= "0.191"
 PREFERRED_VERSION_hydra ?= "4.5"
@@ -1108,10 +1103,6 @@ PREFERRED_VERSION_libmng ?= "1.0.8"
 PREFERRED_VERSION_libmodplug ?= "0.7"
 PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
 PREFERRED_VERSION_libmodule-build-perl-native ?= "0.2805"
-PREFERRED_VERSION_libmokogsmd2 ?= "0.1.0"
-PREFERRED_VERSION_libmokojournal2 ?= "0.1.0"
-PREFERRED_VERSION_libmokopanelui2 ?= "0.3.0"
-PREFERRED_VERSION_libmokoui2 ?= "0.1.0"
 PREFERRED_VERSION_libmpd ?= "0.0.0"
 PREFERRED_VERSION_libmrss ?= "0.17.2"
 PREFERRED_VERSION_libmsgenabler ?= "1.0"
@@ -1477,8 +1468,6 @@ PREFERRED_VERSION_modutils-collateral ?= "1.0"
 PREFERRED_VERSION_modutils-cross ?= "2.4.27"
 PREFERRED_VERSION_modutils-initscripts ?= "1.0"
 PREFERRED_VERSION_moin ?= "1.5.8"
-PREFERRED_VERSION_moko-gtk-engine ?= "0.1.0"
-PREFERRED_VERSION_mokogateway-image ?= "1.0"
 PREFERRED_VERSION_mono ?= "1.2.5.1"
 PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
 PREFERRED_VERSION_mono-native ?= "1.2.5.1"
@@ -2099,42 +2088,6 @@ PREFERRED_VERSION_tapioca ?= "0.3.9"
 PREFERRED_VERSION_tapioca-xmpp ?= "0.3.9"
 PREFERRED_VERSION_tapiocaui ?= "0.3.9.1"
 PREFERRED_VERSION_tar ?= "1.18"
-PREFERRED_VERSION_tar-native ?= "1.13.93"
-PREFERRED_VERSION_task-angstrom-e ?= "1.0"
-PREFERRED_VERSION_task-base ?= "1.0"
-PREFERRED_VERSION_task-boot ?= "1.0"
-PREFERRED_VERSION_task-e-x11 ?= "1.0"
-PREFERRED_VERSION_task-gmae ?= "1.0"
-PREFERRED_VERSION_task-gpe ?= "1.0"
-PREFERRED_VERSION_task-gpe-apps ?= "1.0"
-PREFERRED_VERSION_task-gpe-base ?= "1.0"
-PREFERRED_VERSION_task-gpe-connectivity ?= "1.0"
-PREFERRED_VERSION_task-gpe-desktopapps ?= "1.0"
-PREFERRED_VERSION_task-gpe-games ?= "1.0"
-PREFERRED_VERSION_task-gpe-pim ?= "1.0"
-PREFERRED_VERSION_task-gpe-sectest ?= "1.0"
-PREFERRED_VERSION_task-gpe-settings ?= "1.0"
-PREFERRED_VERSION_task-gpe-web ?= "1.0"
-PREFERRED_VERSION_task-gpephone ?= "1.0"
-PREFERRED_VERSION_task-maemo ?= "1.0"
-PREFERRED_VERSION_task-mokogateway ?= "1.0"
-PREFERRED_VERSION_task-native-sdk ?= "1.0"
-PREFERRED_VERSION_task-proper-tools ?= "1.0"
-PREFERRED_VERSION_task-python-everything ?= "1.09"
-PREFERRED_VERSION_task-python-sharprom ?= "20060425-ml6"
-PREFERRED_VERSION_task-qpe ?= "1.0"
-PREFERRED_VERSION_task-sdk ?= "1.0"
-PREFERRED_VERSION_task-sdk-base ?= "1.0"
-PREFERRED_VERSION_task-sdk-extra ?= "1.0"
-PREFERRED_VERSION_task-sdk-gpephone ?= "1.0"
-PREFERRED_VERSION_task-sdk-host ?= "1.0"
-PREFERRED_VERSION_task-sdk-sbox ?= "1.0"
-PREFERRED_VERSION_task-sdk-sbox-gpe ?= "1.0"
-PREFERRED_VERSION_task-sdl ?= "1.0"
-PREFERRED_VERSION_task-self-hosting ?= "1.0"
-PREFERRED_VERSION_task-slugos ?= "1.0"
-PREFERRED_VERSION_task-xfce-base ?= "1.0"
-PREFERRED_VERSION_task-xterminal ?= "1.0"
 PREFERRED_VERSION_tasklistapplet ?= "1.0.5"
 PREFERRED_VERSION_tasks ?= "0.10"
 PREFERRED_VERSION_tcl ?= "8.4.11"
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index 018f9a8e74..66dc173bf1 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "Common files for the OpenMoko distribution"
+DESCRIPTION = "Common files for the OpenMoko framework"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
index 723042da94..96cf2e2b55 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution, QVGA edition"
+DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework, QVGA edition"
 SECTION = "openmoko/base"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
index e443e36075..bc61580a35 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework"
 SECTION = "openmoko/base"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
index 1cfb519c99..f200b58cb2 100644
--- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
+DESCRIPTION = "Standard sound theme for the OpenMoko framework"
 SECTION = "openmoko/base"
 RREPLACES = "openmoko-sound-theme-standard"
 RPROVIDES = "openmoko-sound-theme-standard"
 PV = "0.1+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 inherit openmoko2 autotools
 
diff --git a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
index 6ac1c3fca4..f0d9c3fb86 100644
--- a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, QVGA edition"
+DESCRIPTION = "Standard Gtk+ theme for the OpenMoko framework, QVGA edition"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 RPROVIDES = "openmoko-theme-standard-2"
 PV = "0.1.0+${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index ec3b4f702e..7279a2aec8 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
+DESCRIPTION = "Standard Gtk+ theme for the OpenMoko framework"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 PV = "0.1.0+${SVNREV}"
-PR = "r4"
+PR = "r5"
 
 inherit openmoko2