angstrom-2007-preferred-versions: fix svn and mickeyl PR entries

1 files changed, 58 insertions, 68 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 308011ddda..a7969e017b 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -367,9 +367,6 @@ PREFERRED_VERSION_eet ?="0.9.10.041"
 PREFERRED_VERSION_eet-native ?="0.9.10.041"
 PREFERRED_VERSION_eflpp ?="0.1.0"
 PREFERRED_VERSION_efreet ?="0.0.3.003"
-PREFERRED_VERSION_eglibc ?="2.6"
-PREFERRED_VERSION_eglibc-initial ?="2.6"
-PREFERRED_VERSION_eglibc-intermediate ?="2.6"
 PREFERRED_VERSION_ekg ?="1.6"
 PREFERRED_VERSION_elf2flt ?="0.0"
 PREFERRED_VERSION_elfkickers ?="2.0a"
@@ -547,7 +544,6 @@ 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"
-PREFERRED_VERSION_gconf-dbus ?="2.16.0"
 PREFERRED_VERSION_gconf-native ?="2.6.1"
 PREFERRED_VERSION_gd ?="2.0.33"
 PREFERRED_VERSION_gdado ?="2.2"
@@ -633,8 +629,6 @@ PREFERRED_VERSION_gnome-vfs-extras ?="0.99.13"
 PREFERRED_VERSION_gnome-vfs-obexftp ?="0.4"
 PREFERRED_VERSION_gnomebaker ?="0.6.0"
 PREFERRED_VERSION_gnomesword ?="2.1.2"
-PREFERRED_VERSION_gnu-config ?="0.1"
-PREFERRED_VERSION_gnu-config-native ?="0.1"
 PREFERRED_VERSION_gnuchess ?="5.05"
 PREFERRED_VERSION_gnumeric ?="1.6.3"
 PREFERRED_VERSION_gnupg ?="1.4.2.2"
@@ -892,8 +886,6 @@ PREFERRED_VERSION_ipkg ?="0.99.163"
 PREFERRED_VERSION_ipkg-collateral ?="1.0"
 PREFERRED_VERSION_ipkg-link ?="1.6"
 PREFERRED_VERSION_ipkg-native ?="0.99.163"
-PREFERRED_VERSION_ipkg-utils ?="1.6"
-PREFERRED_VERSION_ipkg-utils-native ?="1.6"
 PREFERRED_VERSION_iproute2 ?="2.6.22"
 PREFERRED_VERSION_ipsec-tools ?="0.6.7"
 PREFERRED_VERSION_iptables ?="1.3.8"
@@ -1514,7 +1506,7 @@ PREFERRED_VERSION_modutils ?="2.4.27"
 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-ml0"
+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"
@@ -1967,12 +1959,12 @@ PREFERRED_VERSION_pwlib ?="1.5.2"
 PREFERRED_VERSION_pwmpi ?="2.2.7"
 PREFERRED_VERSION_pxaregs ?="1.14"
 PREFERRED_VERSION_py-libmpdclient ?="0.10.0"
-PREFERRED_VERSION_python ?="2.5.1-ml1"
+PREFERRED_VERSION_python ?="2.5.1"
 PREFERRED_VERSION_python-ao ?="0.82"
 PREFERRED_VERSION_python-cheetah ?="1.0"
-PREFERRED_VERSION_python-constraint ?="1.1-ml0"
-PREFERRED_VERSION_python-dbus ?="0.81.1-ml1"
-PREFERRED_VERSION_python-dialog ?="2.7-ml0"
+PREFERRED_VERSION_python-constraint ?="1.1"
+PREFERRED_VERSION_python-dbus ?="0.81.1"
+PREFERRED_VERSION_python-dialog ?="2.7"
 PREFERRED_VERSION_python-ecore ?="0.1.1"
 PREFERRED_VERSION_python-edje ?="0.1.1"
 PREFERRED_VERSION_python-emotion ?="0.1.1"
@@ -1982,93 +1974,92 @@ PREFERRED_VERSION_python-fnorb ?="1.3"
 PREFERRED_VERSION_python-formencode ?="0.4"
 PREFERRED_VERSION_python-fpconst ?="0.6.0"
 PREFERRED_VERSION_python-fuse ?="0.0"
-PREFERRED_VERSION_python-gammu ?="0.21-ml0"
+PREFERRED_VERSION_python-gammu ?="0.21"
 PREFERRED_VERSION_python-gmpy ?="1.0.1"
-PREFERRED_VERSION_python-gnosis ?="1.2.2-ml0"
-PREFERRED_VERSION_python-gst ?="0.10.8-ml0"
+PREFERRED_VERSION_python-gnosis ?="1.2.2"
+PREFERRED_VERSION_python-gst ?="0.10.8"
 PREFERRED_VERSION_python-hmm ?="0.4"
-PREFERRED_VERSION_python-imaging ?="1.1.6-ml0"
-PREFERRED_VERSION_python-imdbpy ?="3.1-ml0"
-PREFERRED_VERSION_python-inotify ?="0.1.0-ml0"
-PREFERRED_VERSION_python-irclib ?="0.4.6-ml0"
-PREFERRED_VERSION_python-itools ?="0.16.5-ml0"
-PREFERRED_VERSION_python-libgmail ?="0.1.6-ml0"
-PREFERRED_VERSION_python-logilab-common ?="0.9.3-ml0"
-PREFERRED_VERSION_python-lxml ?="1.3.3-ml1"
-PREFERRED_VERSION_python-mad ?="0.6-ml0"
+PREFERRED_VERSION_python-imaging ?="1.1.6"
+PREFERRED_VERSION_python-imdbpy ?="3.1"
+PREFERRED_VERSION_python-inotify ?="0.1.0"
+PREFERRED_VERSION_python-irclib ?="0.4.6"
+PREFERRED_VERSION_python-itools ?="0.16.5"
+PREFERRED_VERSION_python-libgmail ?="0.1.6"
+PREFERRED_VERSION_python-logilab-common ?="0.9.3"
+PREFERRED_VERSION_python-lxml ?="1.3.3"
+PREFERRED_VERSION_python-mad ?="0.6"
 PREFERRED_VERSION_python-mysqldb ?="1.2.1"
-PREFERRED_VERSION_python-native ?="2.5.1-ml1"
-PREFERRED_VERSION_python-numarray ?="1.1.1-ml0"
-PREFERRED_VERSION_python-numeric ?="23.7-ml0"
+PREFERRED_VERSION_python-native ?="2.5.1"
+PREFERRED_VERSION_python-numarray ?="1.1.1"
+PREFERRED_VERSION_python-numeric ?="23.7"
 PREFERRED_VERSION_python-ogg ?="1.3"
 PREFERRED_VERSION_python-pexpect ?="2.1"
-PREFERRED_VERSION_python-pybluez ?="0.13-ml0"
-PREFERRED_VERSION_python-pycairo ?="1.4.0-ml0"
-PREFERRED_VERSION_python-pychecker ?="0.8.17-ml0"
-PREFERRED_VERSION_python-pycodes ?="1.2-ml0"
-PREFERRED_VERSION_python-pycrypto ?="2.0.1-ml0"
+PREFERRED_VERSION_python-pybluez ?="0.13"
+PREFERRED_VERSION_python-pycairo ?="1.4.0"
+PREFERRED_VERSION_python-pychecker ?="0.8.17"
+PREFERRED_VERSION_python-pycodes ?="1.2"
+PREFERRED_VERSION_python-pycrypto ?="2.0.1"
 PREFERRED_VERSION_python-pycurl ?="7.16.4"
-PREFERRED_VERSION_python-pyephem ?="3.7.2a-ml0"
-PREFERRED_VERSION_python-pyfits ?="1.1-ml0"
-PREFERRED_VERSION_python-pyflakes ?="0.2.1-ml0"
-PREFERRED_VERSION_python-pygame ?="1.7.1-ml2"
-PREFERRED_VERSION_python-pygnome ?="2.16.2-ml0"
+PREFERRED_VERSION_python-pyephem ?="3.7.2a"
+PREFERRED_VERSION_python-pyfits ?="1.1"
+PREFERRED_VERSION_python-pyflakes ?="0.2.1"
+PREFERRED_VERSION_python-pygame ?="1.7.1"
+PREFERRED_VERSION_python-pygnome ?="2.16.2"
 PREFERRED_VERSION_python-pygobject ?="2.12.3"
 PREFERRED_VERSION_python-pygobject-native ?="2.12.3"
-PREFERRED_VERSION_python-pygoogle ?="0.6-ml0"
-PREFERRED_VERSION_python-pygtk ?="2.10.4-ml2"
+PREFERRED_VERSION_python-pygoogle ?="0.6"
+PREFERRED_VERSION_python-pygtk ?="2.10.4"
 PREFERRED_VERSION_python-pygtk-1.2 ?="0.6.12"
 PREFERRED_VERSION_python-pyid3lib ?="0.5.1"
-PREFERRED_VERSION_python-pyiw ?="0.3.3-ml0"
+PREFERRED_VERSION_python-pyiw ?="0.3.3"
 PREFERRED_VERSION_python-pylinda ?="0.6"
-PREFERRED_VERSION_python-pylint ?="0.13.2-ml0"
+PREFERRED_VERSION_python-pylint ?="0.13.2"
 PREFERRED_VERSION_python-pylirc ?="0.0.5"
 PREFERRED_VERSION_python-pymetar ?="0.11"
 PREFERRED_VERSION_python-pymp3 ?="0.3.4"
-PREFERRED_VERSION_python-pyqt ?="4.3-ml0"
+PREFERRED_VERSION_python-pyqt ?="4.3"
 PREFERRED_VERSION_python-pyrad ?="0.8"
-PREFERRED_VERSION_python-pyraf ?="1.4-ml0"
-PREFERRED_VERSION_python-pyreverse ?="0.5.2-ml0"
-PREFERRED_VERSION_python-pyrex ?="0.9.5.1a-ml0"
-PREFERRED_VERSION_python-pyrex-native ?="0.9.5.1a-ml0"
-PREFERRED_VERSION_python-pyro ?="3.7-ml0"
+PREFERRED_VERSION_python-pyraf ?="1.4"
+PREFERRED_VERSION_python-pyreverse ?="0.5.2"
+PREFERRED_VERSION_python-pyrex ?="0.9.5.1a"
+PREFERRED_VERSION_python-pyrex-native ?="0.9.5.1a"
+PREFERRED_VERSION_python-pyro ?="3.7"
 PREFERRED_VERSION_python-pyserial ?="2.2"
-PREFERRED_VERSION_python-pytester ?="0.6.0-ml0"
+PREFERRED_VERSION_python-pytester ?="0.6.0"
 PREFERRED_VERSION_python-pythondaap ?="0.4"
-PREFERRED_VERSION_python-pyvisa ?="1.1-ml0"
-PREFERRED_VERSION_python-pyweather ?="0.7.0-ml0"
-PREFERRED_VERSION_python-pywpa ?="0.3.4-ml0"
-PREFERRED_VERSION_python-pyxml ?="0.8.4-ml0"
+PREFERRED_VERSION_python-pyvisa ?="1.1"
+PREFERRED_VERSION_python-pyweather ?="0.7.0"
+PREFERRED_VERSION_python-pywpa ?="0.3.4"
+PREFERRED_VERSION_python-pyxml ?="0.8.4"
 PREFERRED_VERSION_python-pyxmlrpc ?="0.8.8.3"
 PREFERRED_VERSION_python-pyzeroconf ?="0.12"
 PREFERRED_VERSION_python-scapy ?="1.1.1"
 PREFERRED_VERSION_python-scons ?="0.97"
 PREFERRED_VERSION_python-scons-native ?="0.97"
-PREFERRED_VERSION_python-setuptools ?="0.6c6-ml1"
+PREFERRED_VERSION_python-setuptools ?="0.6c6"
 PREFERRED_VERSION_python-sgmlop ?="1.1"
 PREFERRED_VERSION_python-simplejson ?="1.7.1"
-PREFERRED_VERSION_python-sip ?="4.7-ml0"
+PREFERRED_VERSION_python-sip ?="4.7"
 PREFERRED_VERSION_python-snmplib ?="0.1.1"
 PREFERRED_VERSION_python-soappy ?="0.11.6"
-PREFERRED_VERSION_python-spydi ?="0.9.7-ml0"
-PREFERRED_VERSION_python-spyro ?="0.9.22-ml0"
-PREFERRED_VERSION_python-sqlobject ?="0.9.1-ml0"
+PREFERRED_VERSION_python-spydi ?="0.9.7"
+PREFERRED_VERSION_python-spyro ?="0.9.22"
+PREFERRED_VERSION_python-sqlobject ?="0.9.1"
 PREFERRED_VERSION_python-sword ?="1.5.9"
-PREFERRED_VERSION_python-tlslite ?="0.3.8-ml0"
-PREFERRED_VERSION_python-urwid ?="0.9.8.1-ml0"
+PREFERRED_VERSION_python-tlslite ?="0.3.8"
+PREFERRED_VERSION_python-urwid ?="0.9.8.1"
 PREFERRED_VERSION_python-vmaps ?="1.1"
 PREFERRED_VERSION_python-vorbis ?="1.3"
-PREFERRED_VERSION_python-webpy ?="0.21-ml0"
-PREFERRED_VERSION_python24 ?="2.4.4-ml2"
+PREFERRED_VERSION_python-webpy ?="0.21"
+PREFERRED_VERSION_python24 ?="2.4.4"
 PREFERRED_VERSION_python24-native ?="2.4.0"
-PREFERRED_VERSION_python24-pyqt2 ?="3.13-ml5"
-PREFERRED_VERSION_python24-pyqwt2 ?="3.10-ml4"
-PREFERRED_VERSION_python24-sip ?="4.1.1-ml4"
+PREFERRED_VERSION_python24-pyqt2 ?="3.13"
+PREFERRED_VERSION_python24-pyqwt2 ?="3.10"
+PREFERRED_VERSION_python24-sip ?="4.1.1"
 PREFERRED_VERSION_qc-usb-messenger ?="1.1"
 PREFERRED_VERSION_qclockchange ?="0.1a"
 PREFERRED_VERSION_qcoptest ?="0.1.1"
 PREFERRED_VERSION_qemu ?="0.9.0"
-PREFERRED_VERSION_qemu-native ?="0.9.0"
 PREFERRED_VERSION_qfish2 ?="1.1.0"
 PREFERRED_VERSION_qgis ?="0.8.1"
 PREFERRED_VERSION_qiv ?="1.9"
@@ -2343,7 +2334,7 @@ PREFERRED_VERSION_task-opie-all ?="1.0"
 PREFERRED_VERSION_task-opie-apps ?="1.0"
 PREFERRED_VERSION_task-opie-games ?="1.0"
 PREFERRED_VERSION_task-proper-tools ?="1.0"
-PREFERRED_VERSION_task-python-everything ?="1.0-ml19"
+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"
@@ -2457,7 +2448,6 @@ PREFERRED_VERSION_ulxmlrpcpp ?="1.5.2"
 PREFERRED_VERSION_uml-image ?="1.0"
 PREFERRED_VERSION_uml-utilities ?="20040406"
 PREFERRED_VERSION_unfreeze ?="1.0"
-PREFERRED_VERSION_unifdef-native ?="2.6.18"
 PREFERRED_VERSION_unionfs-modules ?="1.0.13"
 PREFERRED_VERSION_unionfs-utils ?="1.0.13"
 PREFERRED_VERSION_unionroot ?="0.1.1"