merge of '1fb08a078d2758934f02fa5ac848b7c6a7e2cb31'

     and '6826902a15e323563ac6b3f1a902a98dcabe27e9'

1 files changed, 0 insertions, 56 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 12158f85ad..a6c8af681a 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -25,11 +25,8 @@ PREFERRED_VERSION_alsa-plugins ?= "1.0.14"
 PREFERRED_VERSION_alsa-state ?= "0.1.0"
 PREFERRED_VERSION_alsa-utils ?= "1.0.14"
 PREFERRED_VERSION_altboot ?= "1.1.1"
-PREFERRED_VERSION_altboot-console-image ?= "1.0"
-PREFERRED_VERSION_altboot-x11-image ?= "1.0"
 PREFERRED_VERSION_angstrom-bootmanager ?= "1.0"
 PREFERRED_VERSION_angstrom-feed-configs ?= "1.0"
-PREFERRED_VERSION_angstrom-gmae-image ?= "1.0"
 PREFERRED_VERSION_angstrom-gpe-task-apps ?= "1.0"
 PREFERRED_VERSION_angstrom-gpe-task-base ?= "1.0"
 PREFERRED_VERSION_angstrom-gpe-task-game ?= "1.0"
@@ -133,12 +130,9 @@ PREFERRED_VERSION_boost ?= "1.33.1"
 PREFERRED_VERSION_boost-asio ?= "0.3.7"
 PREFERRED_VERSION_boost-jam-native ?= "3.1.11"
 PREFERRED_VERSION_bootchart ?= "0.9"
-PREFERRED_VERSION_bootmanager-image ?= "1.0"
 PREFERRED_VERSION_bootmenu ?= "0.7"
 PREFERRED_VERSION_bootsplash ?= "3.0.7"
 PREFERRED_VERSION_bootsplash-native ?= "3.0.7"
-PREFERRED_VERSION_bootstrap-image ?= "1.0"
-PREFERRED_VERSION_bootstrap-image-bootchart ?= "1.0"
 PREFERRED_VERSION_brickout ?= "2002.06.09"
 PREFERRED_VERSION_bridge-utils ?= "1.2"
 PREFERRED_VERSION_brutefir ?= "1.0i"
@@ -213,7 +207,6 @@ PREFERRED_VERSION_confuse ?= "2.5"
 PREFERRED_VERSION_confuse-native ?= "2.5"
 PREFERRED_VERSION_connect ?= "0.1"
 PREFERRED_VERSION_conserver ?= "8.1.14"
-PREFERRED_VERSION_console-image ?= "1.0"
 PREFERRED_VERSION_console-tools ?= "0.3.2"
 PREFERRED_VERSION_contacts ?= "0.7"
 PREFERRED_VERSION_coreutils ?= "5.3.0"
@@ -326,8 +319,6 @@ PREFERRED_VERSION_dvbstream ?= "0.0"
 PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814"
 PREFERRED_VERSION_dvbtune ?= "0.0"
 PREFERRED_VERSION_dviviewer ?= "1.0.2"
-PREFERRED_VERSION_e-image ?= "1.0"
-PREFERRED_VERSION_e-image-core ?= "1.0"
 PREFERRED_VERSION_e-uae ?= "0.8.28"
 PREFERRED_VERSION_e-utils ?= "0.0.0"
 PREFERRED_VERSION_e-wm ?= "0.16.999.041"
@@ -394,8 +385,6 @@ PREFERRED_VERSION_esmart ?= "0.9.0"
 PREFERRED_VERSION_esmtp ?= "0.5.1"
 PREFERRED_VERSION_esound ?= "0.2.36"
 PREFERRED_VERSION_espgs ?= "8.15.3"
-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_etk ?= "0.1.0"
@@ -518,17 +507,9 @@ PREFERRED_VERSION_galculator ?= "1.2.3"
 PREFERRED_VERSION_gallery ?= "1.5.5"
 PREFERRED_VERSION_gamin ?= "0.1.8"
 PREFERRED_VERSION_gammu ?= "1.13.0"
-PREFERRED_VERSION_gateway-image ?= "1.0"
 PREFERRED_VERSION_gawk ?= "3.1.4"
 PREFERRED_VERSION_gawk-native ?= "3.1.4"
 PREFERRED_VERSION_gcalctool ?= "5.7.32"
-PREFERRED_VERSION_gcc ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross-kernel-3.3.3 ?= "3.3.3"
-PREFERRED_VERSION_gcc-cross-kernel-3.3.4 ?= "3.3.4"
-PREFERRED_VERSION_gcc-cross-kernel-3.4.4 ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
 PREFERRED_VERSION_gchub-module ?= "0.0"
 PREFERRED_VERSION_gconf ?= "2.6.1"
@@ -657,8 +638,6 @@ PREFERRED_VERSION_gpe-gallery ?= "0.97"
 PREFERRED_VERSION_gpe-go ?= "0.05"
 PREFERRED_VERSION_gpe-helpviewer ?= "1.0"
 PREFERRED_VERSION_gpe-icons ?= "0.25"
-PREFERRED_VERSION_gpe-image ?= "1.0"
-PREFERRED_VERSION_gpe-image-blank-user ?= "1.0"
 PREFERRED_VERSION_gpe-irc ?= "0.08"
 PREFERRED_VERSION_gpe-keylock ?= "0.12"
 PREFERRED_VERSION_gpe-life ?= "0.2"
@@ -699,8 +678,6 @@ PREFERRED_VERSION_gpe-todo-hildon ?= "0.55"
 PREFERRED_VERSION_gpe-watch ?= "0.10"
 PREFERRED_VERSION_gpe-what ?= "0.43"
 PREFERRED_VERSION_gpe-windowlist ?= "0.1"
-PREFERRED_VERSION_gpephone-image ?= "1.0"
-PREFERRED_VERSION_gpephone-image-vm ?= "1.0"
 PREFERRED_VERSION_gperf ?= "3.0.3"
 PREFERRED_VERSION_gperf-native ?= "3.0.3"
 PREFERRED_VERSION_gperiodic ?= "1.3.3"
@@ -779,7 +756,6 @@ PREFERRED_VERSION_haserl ?= "0.8.0"
 PREFERRED_VERSION_havp ?= "0.86"
 PREFERRED_VERSION_hdparm ?= "6.9"
 PREFERRED_VERSION_helloworld ?= "1.0.0"
-PREFERRED_VERSION_helloworld-image ?= "1.0"
 PREFERRED_VERSION_hexatrolic ?= "1.0beta3"
 PREFERRED_VERSION_hfsplusutils ?= "1.0.4-4"
 PREFERRED_VERSION_hfsutils ?= "3.2.6"
@@ -836,9 +812,7 @@ PREFERRED_VERSION_imlib ?= "1.9.15"
 PREFERRED_VERSION_imlib2 ?= "1.4.0.002"
 PREFERRED_VERSION_imposter ?= "0.3"
 PREFERRED_VERSION_inetutils ?= "1.4.2"
-PREFERRED_VERSION_initramfs-image ?= "1.0"
 PREFERRED_VERSION_initramfs-jffs2 ?= "0.1"
-PREFERRED_VERSION_initramfs-minimal-image ?= "1.0"
 PREFERRED_VERSION_initramfs-module-block ?= "0.1"
 PREFERRED_VERSION_initramfs-module-loop ?= "0.1"
 PREFERRED_VERSION_initramfs-module-nfs ?= "0.1"
@@ -1297,12 +1271,7 @@ PREFERRED_VERSION_links ?= "2.0"
 PREFERRED_VERSION_links-x11 ?= "2.0"
 PREFERRED_VERSION_linphone ?= "1.6.0"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
-PREFERRED_VERSION_linux ?= "2.6.21"
-PREFERRED_VERSION_linux-atm ?= "2.4.1"
-PREFERRED_VERSION_linux-bd-neon-2.6 ?= "2.6.22"
-PREFERRED_VERSION_linux-ezx ?= "2.6.21-ezxdev"
 PREFERRED_VERSION_linux-hotplug ?= "20040920"
-PREFERRED_VERSION_linux-input ?= "0.0"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
 PREFERRED_VERSION_lirc ?= "0.8.1"
 PREFERRED_VERSION_lirc-modules ?= "0.8.1"
@@ -1310,7 +1279,6 @@ PREFERRED_VERSION_lisa ?= "0.2.2"
 PREFERRED_VERSION_lite ?= "0.9.26"
 PREFERRED_VERSION_litestream ?= "1.3RC3"
 PREFERRED_VERSION_live555 ?= "20051005"
-PREFERRED_VERSION_liveramdisk-image ?= "1.0"
 PREFERRED_VERSION_llvm ?= "2.0"
 PREFERRED_VERSION_llvm-gcc4 ?= "2.0"
 PREFERRED_VERSION_llvm-gcc4-cross ?= "2.1"
@@ -1349,7 +1317,6 @@ PREFERRED_VERSION_madfu ?= "1.2"
 PREFERRED_VERSION_madplay ?= "0.15.2b"
 PREFERRED_VERSION_madwifi-modules ?= "1.0.0"
 PREFERRED_VERSION_madwifi-ng ?= "r2518-20070626"
-PREFERRED_VERSION_maemo-image ?= "1.0"
 PREFERRED_VERSION_maemo-mapper ?= "1.4.7"
 PREFERRED_VERSION_maemo-mapper-nohildon ?= "1.2.4"
 PREFERRED_VERSION_mahjongg ?= "1.0.0"
@@ -1445,8 +1412,6 @@ PREFERRED_VERSION_minicom ?= "2.1"
 PREFERRED_VERSION_minifo-modules ?= "0.6.1-pre1"
 PREFERRED_VERSION_miniinit ?= "1.0"
 PREFERRED_VERSION_minilite ?= "0.50"
-PREFERRED_VERSION_minimal-image ?= "1.0"
-PREFERRED_VERSION_minimal-image-with-mtd-utils ?= "1.0"
 PREFERRED_VERSION_minimix ?= "0.9"
 PREFERRED_VERSION_minimo ?= "0.02"
 PREFERRED_VERSION_minipredict ?= "1.0"
@@ -1506,7 +1471,6 @@ PREFERRED_VERSION_mysql ?= "4.1.18"
 PREFERRED_VERSION_mysql-native ?= "4.1.18"
 PREFERRED_VERSION_mystun-server ?= "0.0"
 PREFERRED_VERSION_mythfront-config ?= "1.10"
-PREFERRED_VERSION_mythfront-image ?= "1.0"
 PREFERRED_VERSION_mythfront-session ?= "1.5"
 PREFERRED_VERSION_nabi ?= "0.17"
 PREFERRED_VERSION_nail ?= "11.21"
@@ -1552,7 +1516,6 @@ PREFERRED_VERSION_notecase ?= "1.2.6"
 PREFERRED_VERSION_notez ?= "1.1.0"
 PREFERRED_VERSION_notification-daemon ?= "0.3.7"
 PREFERRED_VERSION_nsd ?= "2.0.0"
-PREFERRED_VERSION_nslu2-linksys-image ?= "1.0"
 PREFERRED_VERSION_ntfs-3g ?= "1.0"
 PREFERRED_VERSION_ntop ?= "3.0"
 PREFERRED_VERSION_ntp ?= "4.2.2p3"
@@ -1560,11 +1523,6 @@ PREFERRED_VERSION_ntp-ssl ?= "4.1.2"
 PREFERRED_VERSION_ntpclient ?= "2003_194"
 PREFERRED_VERSION_nunome ?= "1.0.2"
 PREFERRED_VERSION_nylon-feed ?= "1.0"
-PREFERRED_VERSION_nylon-image-base ?= "1.0"
-PREFERRED_VERSION_nylon-image-extended ?= "1.0"
-PREFERRED_VERSION_nylon-image-extra ?= "1.0"
-PREFERRED_VERSION_nylon-image-mini ?= "1.0"
-PREFERRED_VERSION_nylon-image-standard ?= "1.0"
 PREFERRED_VERSION_nylon-scripts ?= "1.0.0"
 PREFERRED_VERSION_nylon-statistics ?= "1.0.0"
 PREFERRED_VERSION_obby ?= "0.4.1"
@@ -1593,7 +1551,6 @@ PREFERRED_VERSION_openocd ?= "0.0"
 PREFERRED_VERSION_openocd-native ?= "0.0"
 PREFERRED_VERSION_openpbx.org ?= "1.2_rc3"
 PREFERRED_VERSION_openpbx.org-perl ?= "1.0"
-PREFERRED_VERSION_openprotium-image ?= "1.0"
 PREFERRED_VERSION_openprotium-init ?= "0.10"
 PREFERRED_VERSION_openprotium-packages ?= "1.0"
 PREFERRED_VERSION_opensp ?= "1.5"
@@ -1617,7 +1574,6 @@ PREFERRED_VERSION_osb-browser ?= "0.5.0"
 PREFERRED_VERSION_osb-jscore ?= "0.5.2"
 PREFERRED_VERSION_osb-nrcit ?= "0.5.2"
 PREFERRED_VERSION_osb-nrcore ?= "0.5.2"
-PREFERRED_VERSION_ossie-image ?= "1.0"
 PREFERRED_VERSION_osso-af-settings ?= "0.8.5"
 PREFERRED_VERSION_osso-af-startup ?= "0.28-1"
 PREFERRED_VERSION_osso-af-utils ?= "0.4"
@@ -1668,7 +1624,6 @@ PREFERRED_VERSION_pidgin ?= "2.2.1"
 PREFERRED_VERSION_pine ?= "4.64"
 PREFERRED_VERSION_pipeman ?= "1.0.0"
 PREFERRED_VERSION_pipepanic ?= "0.1.1"
-PREFERRED_VERSION_pivotboot-image ?= "1.0"
 PREFERRED_VERSION_pivotinit ?= "1.0.0"
 PREFERRED_VERSION_pixman ?= "0.9.5"
 PREFERRED_VERSION_pixops-test ?= "1.0"
@@ -1966,9 +1921,7 @@ PREFERRED_VERSION_sdcc-native ?= "2.5.0"
 PREFERRED_VERSION_sdk-default-icons ?= "0.2-1"
 PREFERRED_VERSION_sdk-default-theme ?= "0.1-1"
 PREFERRED_VERSION_sdk-default-theme-config ?= "1.0-1"
-PREFERRED_VERSION_sdl-image ?= "1.0"
 PREFERRED_VERSION_sdl-perl ?= "1.20.3"
-PREFERRED_VERSION_sectest-gpe-image ?= "1.0"
 PREFERRED_VERSION_sed ?= "4.1.2"
 PREFERRED_VERSION_sed-native ?= "4.1.2"
 PREFERRED_VERSION_ser ?= "0.9.0"
@@ -2007,7 +1960,6 @@ PREFERRED_VERSION_sliderulez ?= "0.92"
 PREFERRED_VERSION_slotsig ?= "0.6"
 PREFERRED_VERSION_slrn ?= "0.9.8.0"
 PREFERRED_VERSION_slsnif ?= "0.4.4"
-PREFERRED_VERSION_slugimage ?= "1.0"
 PREFERRED_VERSION_slugimage-native ?= "1.0"
 PREFERRED_VERSION_slugos-init ?= "0.10"
 PREFERRED_VERSION_slugos-native ?= "1.0"
@@ -2158,7 +2110,6 @@ PREFERRED_VERSION_ttyconv ?= "0.2.3"
 PREFERRED_VERSION_ttyrec ?= "1.0.8"
 PREFERRED_VERSION_tuxnes ?= "0.75"
 PREFERRED_VERSION_twin ?= "0.4.6"
-PREFERRED_VERSION_twin-image ?= "1.0"
 PREFERRED_VERSION_twisted ?= "2.5.0"
 PREFERRED_VERSION_twm ?= "1.0.3"
 PREFERRED_VERSION_twutils ?= "0.2"
@@ -2183,7 +2134,6 @@ PREFERRED_VERSION_uim ?= "1.3.1"
 PREFERRED_VERSION_uim-native ?= "1.3.1"
 PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
 PREFERRED_VERSION_ulxmlrpcpp ?= "1.5.2"
-PREFERRED_VERSION_uml-image ?= "1.0"
 PREFERRED_VERSION_uml-utilities ?= "20040406"
 PREFERRED_VERSION_unfreeze ?= "1.0"
 PREFERRED_VERSION_unionfs-modules ?= "1.0.13"
@@ -2273,10 +2223,6 @@ PREFERRED_VERSION_wview-wxt510 ?= "3.1.3"
 PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3"
 PREFERRED_VERSION_wxbase ?= "2.7"
 PREFERRED_VERSION_wxwidgets ?= "2.6.3"
-PREFERRED_VERSION_x11-gpe-image ?= "1.0"
-PREFERRED_VERSION_x11-image ?= "1.0"
-PREFERRED_VERSION_x11-office-image ?= "1.0"
-PREFERRED_VERSION_x11-pimlico-image ?= "1.0"
 PREFERRED_VERSION_x11perf ?= "1.4.1"
 PREFERRED_VERSION_x11vnc ?= "0.9.3"
 PREFERRED_VERSION_xaos ?= "3.2.3"
@@ -2332,7 +2278,6 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
 PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
 PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
 PREFERRED_VERSION_xfcalendar ?= "4.2.3"
-PREFERRED_VERSION_xfce-image ?= "1.0"
 PREFERRED_VERSION_xfce-mcs-manager ?= "4.4.1"
 PREFERRED_VERSION_xfce-mcs-plugins ?= "4.4.1"
 PREFERRED_VERSION_xfce-terminal ?= "0.2.6"
@@ -2397,7 +2342,6 @@ PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_xstroke ?= "0.6"
 PREFERRED_VERSION_xsvg ?= "0.0"
 PREFERRED_VERSION_xterm ?= "207"
-PREFERRED_VERSION_xterminal-image ?= "1.0"
 PREFERRED_VERSION_xtrans ?= "1.0.4"
 PREFERRED_VERSION_xtrans-native ?= "1.0.3"
 PREFERRED_VERSION_xtscal ?= "0.6.3"