sysdeps update: remove Ubuntu 8.04 (doesn't work), supporting Sugar Platform 0.84 (except espeak on some platforms) now

8 files changed, 168 insertions, 195 deletions

diff --git a/config/sysdeps/debian-unstable.xml b/config/sysdeps/debian-unstable.xml
index 60e1ac5..816479e 100644
--- a/config/sysdeps/debian-unstable.xml
+++ b/config/sysdeps/debian-unstable.xml
@@ -5,12 +5,17 @@
   <package name="debhelper"/>
   <package name="devscripts"/>
   <package name="docbook-xsl"/>
+  <package name="evince"/>
+  <package name="espeak"/>
+  <package name="espeak-data"/>
   <package name="g++"/>
   <package name="gcc"/>
   <package name="gettext"/>
   <package name="gnome-common"/>
   <package name="gnome-doc-utils"/>
   <package name="gnome-icon-theme"/>
+  <package name="gstreamer0.10-plugins-base"/>
+  <package name="gstreamer0.10-plugins-good"/>
   <package name="gtk-doc-tools"/>
   <package name="icon-naming-utils"/>
   <package name="icon-slicer"/>
@@ -19,10 +24,12 @@
   <package name="libavahi-gobject-dev"/>
   <package name="libboost-dev"/>
   <package name="libcroco3-dev"/>
+  <package name="libcsound64-dev"/>
   <package name="libdbus-1-dev"/>
   <package name="libdbus-glib-1-dev"/>
   <package name="libenchant-dev"/>
   <package name="libexpat1-dev"/>
+  <package name="libffi-dev"/>
   <package name="libfribidi-dev"/>
   <package name="libgconf2-dev"/>
   <package name="libglade2-dev"/>
@@ -34,6 +41,7 @@
   <package name="libidl-dev"/>
   <package name="libloudmouth1-dev"/>
   <package name="libnspr4-dev"/>
+<!--  <package name="libpoppler-dev"/> -->
   <package name="libpoppler-glib-dev"/>
   <package name="libpopt-dev"/>
   <package name="librsvg2-dev"/>
@@ -50,14 +58,18 @@
   <package name="python-cairo-dev"/>
   <package name="python-central"/>
   <package name="python-cjson"/>
+  <package name="python-csound"/>
   <package name="python-dbus"/>
   <package name="python-dev"/>
   <package name="python-empy"/>
+  <package name="python-gconf"/>
   <package name="python-gnome2"/>
+<!--  <package name="python-gnome2-desktop" source="gnome-python-desktop"/> -->
   <package name="python-gobject" source="pygobject"/>
   <package name="python-gst0.10"/>
   <package name="python-gtk2-dev"/>
   <package name="python-gtksourceview2"/>
+  <package name="python-libxml2"/>
   <package name="python-numpy"/>
   <package name="python-pygame"/>
   <package name="python-simplejson"/>
@@ -69,6 +81,7 @@
   <package name="unzip"/>
   <package name="x11-utils"/>
   <package name="xserver-xephyr"/>
+<!--  <package name="xulrunner-1.9-dev" source="xulrunner"/> -->
   <package name="zip"/>
   <package name="zlib1g-dev"/>
 </dependencies>
diff --git a/config/sysdeps/fedora-10.xml b/config/sysdeps/fedora-10.xml
index 7295999..d5691e8 100644
--- a/config/sysdeps/fedora-10.xml
+++ b/config/sysdeps/fedora-10.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <dependencies>
   <package name="alsa-lib-devel"/>
+  <package name="avahi" source="avahi"/>
+  <package name="avahi-gobject-devel" source="avahi"/>
+  <package name="avahi-tools" source="avahi"/>
   <package name="boost-devel"/>
   <package name="dbus-devel"/>
   <package name="dbus-glib-devel"/>
@@ -20,46 +23,48 @@
   <package name="gnome-python2-libwnck"/>
   <package name="gnome-python2-rsvg"/>
   <package name="gnome-vfs2-devel"/>
+  <package name="gstreamer-plugins-base"/>
+  <package name="gstreamer-plugins-good"/>
   <package name="gstreamer-python"/>
   <package name="gtk2-devel"/>
+  <package name="hippo-canvas-python" source="hippo-canvas"/>
   <package name="icon-naming-utils"/>
   <package name="icon-slicer"/>
   <package name="intltool"/>
+  <package name="libabiword" source="abiword"/>
+  <package name="libabiword" source="abiword-plugins"/>
   <package name="libcroco-devel"/>
+  <package name="libffi-devel"/>
   <package name="libglade2-devel"/>
   <package name="libgsf-devel"/>
+  <package name="libmatchbox" source="libmatchbox"/>
   <package name="librsvg2-devel"/>
   <package name="libtool"/>
+  <package name="libxml2-python"/>
   <package name="libXt-devel"/>
   <package name="loudmouth-devel"/>
   <package name="make"/>
+  <package name="matchbox-window-manager" source="matchbox-window-manager"/>
   <package name="numpy"/>
+  <package name="olpcsound-devel"/>
   <package name="poppler-glib-devel"/>
   <package name="popt-devel"/>
+  <package name="pyabiword" source="pyabiword"/>
+  <package name="pygame"/>
+  <package name="pygobject2" source="pygobject"/>
   <package name="pygtk2-devel"/>
   <package name="pygtksourceview"/>
   <package name="python-cjson"/>
-  <package name="python-simplejson"/>
   <package name="python-devel"/>
+  <package name="python-simplejson"/>
   <package name="subversion"/>
   <package name="wv-devel"/>
   <package name="xapian-bindings-python"/>
   <package name="xapian-core-libs"/>
   <package name="xorg-x11-server-Xephyr"/>
   <package name="xorg-x11-utils"/>
-  <package name="zlib-devel"/>
-
-  <package name="avahi" source="avahi"/>
-  <package name="avahi-gobject-devel" source="avahi"/>
-  <package name="avahi-tools" source="avahi"/>
-  <package name="hippo-canvas-python" source="hippo-canvas"/>
-  <package name="libabiword" source="abiword"/>
-  <package name="libabiword" source="abiword-plugins"/>
-  <package name="libmatchbox" source="libmatchbox"/>
-  <package name="matchbox-window-manager" source="matchbox-window-manager"/>
-  <package name="pyabiword" source="pyabiword"/>
-  <package name="pygobject2" source="pygobject"/>
   <package name="xulrunner-devel-unstable" source="xulrunner"/>
   <package name="xulrunner-python" source="xulrunner"/>
   <package name="xulrunner-python-devel" source="xulrunner"/>
+  <package name="zlib-devel"/>
 </dependencies>
diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml
index cdf37e5..d5691e8 100644
--- a/config/sysdeps/fedora-rawhide.xml
+++ b/config/sysdeps/fedora-rawhide.xml
@@ -1,79 +1,70 @@
 <?xml version="1.0"?>
 <dependencies>
-  <package name="intltool"/>
-  <package name="libtool"/>
-  <package name="python-devel"/>
-  <package name="gcc"/>
-  <package name="gcc-c++"/>
-  <package name="gtk2-devel"/>
-  <package name="pygtk2-devel"/>
-  <package name="libcroco-devel"/>
-  <package name="libgsf-devel"/>
-  <package name="enchant-devel"/>
-  <package name="fribidi-devel"/>
+  <package name="alsa-lib-devel"/>
+  <package name="avahi" source="avahi"/>
+  <package name="avahi-gobject-devel" source="avahi"/>
+  <package name="avahi-tools" source="avahi"/>
   <package name="boost-devel"/>
-  <package name="libXt-devel"/>
-  <package name="gnome-doc-utils"/>
+  <package name="dbus-devel"/>
+  <package name="dbus-glib-devel"/>
+  <package name="dbus-python"/>
+  <package name="dejavu-fonts"/>
+  <package name="enchant-devel"/>
   <package name="expat-devel"/>
+  <package name="fribidi-devel"/>
+  <package name="gcc"/>
+  <package name="gcc-c++"/>
+  <package name="GConf2-devel"/>
   <package name="gettext-devel"/>
-  <package name="wv-devel"/>
-  <package name="zlib-devel"/>
   <package name="gnome-common"/>
-  <package name="numpy"/>
+  <package name="gnome-doc-utils"/>
+  <package name="gnome-icon-theme"/>
+  <package name="gnome-python2-gconf"/>
   <package name="gnome-python2-libwnck"/>
-  <package name="xorg-x11-server-Xephyr"/>
-  <package name="make"/>
   <package name="gnome-python2-rsvg"/>
-  <package name="python-cjson"/>
-  <package name="subversion"/>
-  <package name="GConf2-devel"/>
-  <package name="libglade2-devel"/>
-  <package name="popt-devel"/>
   <package name="gnome-vfs2-devel"/>
-  <package name="librsvg2-devel"/>
-  <package name="gnome-icon-theme"/>
-  <package name="icon-naming-utils"/>
-  <package name="xorg-x11-utils"/>
-  <package name="dejavu-fonts"/>
+  <package name="gstreamer-plugins-base"/>
+  <package name="gstreamer-plugins-good"/>
   <package name="gstreamer-python"/>
+  <package name="gtk2-devel"/>
+  <package name="hippo-canvas-python" source="hippo-canvas"/>
+  <package name="icon-naming-utils"/>
   <package name="icon-slicer"/>
+  <package name="intltool"/>
+  <package name="libabiword" source="abiword"/>
+  <package name="libabiword" source="abiword-plugins"/>
+  <package name="libcroco-devel"/>
+  <package name="libffi-devel"/>
+  <package name="libglade2-devel"/>
+  <package name="libgsf-devel"/>
+  <package name="libmatchbox" source="libmatchbox"/>
+  <package name="librsvg2-devel"/>
+  <package name="libtool"/>
+  <package name="libxml2-python"/>
+  <package name="libXt-devel"/>
+  <package name="loudmouth-devel"/>
+  <package name="make"/>
+  <package name="matchbox-window-manager" source="matchbox-window-manager"/>
+  <package name="numpy"/>
+  <package name="olpcsound-devel"/>
+  <package name="poppler-glib-devel"/>
+  <package name="popt-devel"/>
+  <package name="pyabiword" source="pyabiword"/>
+  <package name="pygame"/>
+  <package name="pygobject2" source="pygobject"/>
+  <package name="pygtk2-devel"/>
   <package name="pygtksourceview"/>
-  <package name="alsa-lib-devel"/>
+  <package name="python-cjson"/>
+  <package name="python-devel"/>
+  <package name="python-simplejson"/>
+  <package name="subversion"/>
+  <package name="wv-devel"/>
   <package name="xapian-bindings-python"/>
   <package name="xapian-core-libs"/>
-  <package name="gnome-python2-gconf"/>
-  <package name="dbus-python"/>
-  <package name="dbus-devel"/>
-  <package name="dbus-glib-devel"/>
-  <package name="loudmouth-devel"/>
-  <package name="poppler-glib-devel"/>
-
-  <package name="avahi"
-           source="avahi"/>
-  <package name="avahi-gobject-devel"
-           source="avahi"/>
-  <package name="avahi-tools"
-           source="avahi"/>
-  <package name="pygobject2"
-           source="pygobject"/>
-  <package name="libmatchbox"
-           source="libmatchbox"/>
-  <package name="matchbox-window-manager"
-           source="matchbox-window-manager"/>
-  <package name="xulrunner-python-devel"
-           source="xulrunner"/>
-  <package name="xulrunner-python"
-           source="xulrunner"/>
-  <package name="xulrunner-devel-unstable"
-           source="xulrunner"/>
-  <package name="hippo-canvas-python"
-           source="hippo-canvas"/>
-  <package name="pyabiword"
-           source="pyabiword"/>
-  <package name="libabiword"
-           source="abiword"/>
-  <package name="libabiword"
-           source="abiword-plugins"/>
-  <package name="hippo-canvas-python"
-           source="hippo-canvas"/>
+  <package name="xorg-x11-server-Xephyr"/>
+  <package name="xorg-x11-utils"/>
+  <package name="xulrunner-devel-unstable" source="xulrunner"/>
+  <package name="xulrunner-python" source="xulrunner"/>
+  <package name="xulrunner-python-devel" source="xulrunner"/>
+  <package name="zlib-devel"/>
 </dependencies>
diff --git a/config/sysdeps/mandrivalinux-2009.1.xml b/config/sysdeps/mandrivalinux-2009.1.xml
index 6f9277e..8d0823d 100644
--- a/config/sysdeps/mandrivalinux-2009.1.xml
+++ b/config/sysdeps/mandrivalinux-2009.1.xml
@@ -1,73 +1,69 @@
 <?xml version="1.0"?>
 <dependencies>
-  <package name="intltool"/>
-  <package name="libtool"/>
+  <package name="alsa-lib-devel"/>
   <package name="autoconf"/>
   <package name="automake"/>
-  <package name="python-devel"/>
-  <package name="gcc"/>
-  <package name="gcc-c++"/>
-  <package name="gtk2-devel"/>
-  <package name="pygtk2.0-devel"/>
-  <package name="libcroco0.6_3-devel"/>
-  <package name="libgsf-devel"/>
-  <package name="enchant-devel"/>
-  <package name="fribidi-devel"/>
+  <package name="avahi" source="avahi"/>
+  <package name="avahi-gobject-devel" source="avahi"/>
   <package name="boost-devel"/>
-  <package name="libxt6-devel"/>
-  <package name="gnome-doc-utils"/>
+  <package name="dbus-devel"/>
+  <package name="dbus-glib-devel"/>
+  <package name="dbus-python"/>
+  <package name="enchant-devel"/>
   <package name="expat-devel"/>
+  <package name="fonts-ttf-dejavu"/>
+  <package name="fribidi-devel"/>
+  <package name="gcc"/>
+  <package name="gcc-c++"/>
   <package name="gettext-devel"/>
-  <package name="wv-devel"/>
-  <package name="zlib-devel"/>
   <package name="gnome-common"/>
-  <package name="python-numpy"/>
-  <package name="x11-server-xephyr"/>
-  <package name="make"/>
+  <package name="gnome-doc-utils"/>
+  <package name="gnome-icon-theme"/>
   <package name="gnome-python-desktop"/>
-  <package name="python-cjson"/>
-  <package name="subversion"/>
-  <package name="libGConf2-devel"/>
-  <package name="libglade2-devel"/>
-  <package name="popt-devel"/>
+  <package name="gnome-python-gconf"/>
   <package name="gnome-vfs2-devel"/>
-  <package name="librsvg2-devel"/>
-  <package name="gnome-icon-theme"/>
-  <package name="icon-naming-utils"/>
-  <package name="fonts-ttf-dejavu"/>
+  <package name="gstreamer0.10-espeak"/>
+  <package name="gstreamer0.10-plugins-base"/>
+  <package name="gstreamer0.10-plugins-good"/>
   <package name="gstreamer0.10-python"/>
+  <package name="gtk2-devel"/>
+  <package name="icon-naming-utils"/>
   <package name="icon-slicer"/>
-  <package name="python-gtksourceview"/>
-  <package name="alsa-lib-devel"/>
-  <package name="xapian-bindings-python"/>
+  <package name="intltool"/>
+  <package name="libabiword" source="abiword"/>
+  <package name="libabiword" source="abiword-plugins"/>
+  <package name="libcroco0.6_3-devel"/>
+  <package name="libffi5"/>
+  <package name="libGConf2-devel"/>
+  <package name="libglade2-devel"/>
+  <package name="libgsf-devel"/>
+  <package name="libpoppler-glib-devel"/>
+  <package name="librsvg2-devel"/>
+  <package name="libtool"/>
   <package name="libxapian15"/>
-  <package name="gnome-python-gconf"/>
-  <package name="dbus-python"/>
-  <package name="dbus-devel"/>
-  <package name="dbus-glib-devel"/>
+  <package name="libxml2-python"/>
+  <package name="libxt6-devel"/>
   <package name="loudmouth-devel"/>
-  <package name="libpoppler-glib-devel"/>
-
-  <package name="avahi"
-           source="avahi"/>
-  <package name="avahi-gobject-devel"
-           source="avahi"/>
-  <package name="python-gobject"
-           source="pygobject"/>
-  <package name="matchbox-common"
-           source="libmatchbox"/>
-  <package name="matchbox-window-manager"
-           source="matchbox-window-manager"/>
-  <package name="python-xpcom"
-           source="xulrunner"/>
-  <package name="xulrunner-devel-unstable"
-           source="xulrunner"/>
-  <package name="python-hippo-canvas"
-           source="hippo-canvas"/>
-  <package name="python-abiword"
-           source="pyabiword"/>
-  <package name="libabiword"
-           source="abiword"/>
-  <package name="libabiword"
-           source="abiword-plugins"/>
+  <package name="make"/>
+  <package name="matchbox-common" source="libmatchbox"/>
+  <package name="matchbox-window-manager" source="matchbox-window-manager"/>
+  <package name="olpcsound"/>
+  <package name="popt-devel"/>
+  <package name="pygame"/>
+  <package name="pygtk2.0-devel"/>
+  <package name="python-abiword" source="pyabiword"/>
+  <package name="python-cjson"/>
+  <package name="python-devel"/>
+  <package name="python-gobject" source="pygobject"/>
+  <package name="python-gtksourceview"/>
+  <package name="python-hippo-canvas" source="hippo-canvas"/>
+  <package name="python-numpy"/>
+  <package name="python-olpcsound"/>
+  <package name="python-xpcom" source="xulrunner"/>
+  <package name="subversion"/>
+  <package name="wv-devel"/>
+  <package name="x11-server-xephyr"/>
+  <package name="xapian-bindings-python"/>
+  <package name="xulrunner-devel-unstable" source="xulrunner"/>
+  <package name="zlib-devel"/>
 </dependencies>
diff --git a/config/sysdeps/olpc-4.xml b/config/sysdeps/olpc-4.xml
index 2aa95ae..6d215bd 100644
--- a/config/sysdeps/olpc-4.xml
+++ b/config/sysdeps/olpc-4.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <dependencies>
+  <!-- Note: this file is more or less unmaintained -->
   <package name="intltool"/>
   <package name="libtool"/>
   <package name="python-devel"/>
diff --git a/config/sysdeps/ubuntu-8.04.xml b/config/sysdeps/ubuntu-8.04.xml
deleted file mode 100644
index 578ac7f..0000000
--- a/config/sysdeps/ubuntu-8.04.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<dependencies>
-  <package name="intltool"/>
-  <package name="libtool"/>
-  <package name="python-dev"/>
-  <package name="gcc"/>
-  <package name="g++"/>
-  <package name="libgtk2.0-dev"/>
-  <package name="python-gtk2-dev"/>
-  <package name="python-cairo-dev"/>
-  <package name="libcroco3-dev"/>
-  <package name="libgsf-1-dev"/>
-  <package name="libenchant-dev"/>
-  <package name="libfribidi-dev"/>
-  <package name="libboost-dev"/>
-  <package name="libxt-dev"/>
-  <package name="gnome-doc-utils"/>
-  <package name="libexpat1-dev"/>
-  <package name="gettext"/>
-  <package name="libwv-dev"/>
-  <package name="zlib1g-dev"/>
-  <package name="gnome-common"/>
-  <package name="python-numpy"/>
-  <package name="libwnck-dev"/>
-  <package name="xserver-xephyr"/>
-  <package name="make"/>
-  <package name="librsvg2-dev"/>
-  <package name="python-cjson"/>
-  <package name="automake1.9"/>
-  <package name="subversion"/>
-  <package name="gtk-doc-tools"/>
-  <package name="libglade2-dev"/>
-  <package name="libidl-dev"/>
-  <package name="libgconf2-dev"/>
-  <package name="libgnomevfs2-dev"/>
-  <package name="libpoppler-glib-dev"/>
-  <package name="gnome-icon-theme"/>
-  <package name="icon-naming-utils"/>
-  <package name="x11-utils"/>
-  <package name="icon-slicer"/>
-  <package name="libasound2-dev"/>
-  <package name="python-xapian"/>
-  <package name="libxapian15"/>
-  <package name="python-gtksourceview2"/>
-  <package name="python-gconf"/>
-  <package name="python-dbus"/>
-  <package name="libdbus-1-dev"/>
-  <package name="libdbus-glib-1-dev"/>
-  <package name="libloudmouth1-dev"/>
-  <package name="libavahi-gobject-dev"/>
-  <package name="python-avahi"/>
-  <package name="libpoppler-dev"/>
-  <package name="python-gobject"
-	   source="pygobject"/>
-  <package name="xulrunner-1.9-dev"
-	   source="xulrunner"/>
-  <package name="libsoup2.4-dev" source="libsoup"/>
-  <package name="libglib2.0-dev"/>
-  <package name="libpoppler-glib-dev"/>
-</dependencies>
diff --git a/config/sysdeps/ubuntu-8.10.xml b/config/sysdeps/ubuntu-8.10.xml
index 136812a..38779c1 100644
--- a/config/sysdeps/ubuntu-8.10.xml
+++ b/config/sysdeps/ubuntu-8.10.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
 <dependencies>
   <package name="automake1.9"/>
+  <package name="evince"/>
   <package name="g++"/>
   <package name="gcc"/>
   <package name="gettext"/>
   <package name="gnome-common"/>
   <package name="gnome-doc-utils"/>
   <package name="gnome-icon-theme"/>
+  <package name="gstreamer0.10-plugins-base"/>
+  <package name="gstreamer0.10-plugins-good"/>
   <package name="gtk-doc-tools"/>
   <package name="icon-naming-utils"/>
   <package name="icon-slicer"/>
@@ -15,10 +18,12 @@
   <package name="libavahi-gobject-dev"/>
   <package name="libboost-dev"/>
   <package name="libcroco3-dev"/>
+  <package name="libcsound64-dev"/>
   <package name="libdbus-1-dev"/>
   <package name="libdbus-glib-1-dev"/>
   <package name="libenchant-dev"/>
   <package name="libexpat1-dev"/>
+  <package name="libffi-dev"/>
   <package name="libfribidi-dev"/>
   <package name="libgconf2-dev"/>
   <package name="libglade2-dev"/>
@@ -42,6 +47,7 @@
   <package name="python-avahi"/>
   <package name="python-cairo-dev"/>
   <package name="python-cjson"/>
+  <package name="python-csound"/>
   <package name="python-dbus"/>
   <package name="python-dev"/>
   <package name="python-gconf"/>
@@ -50,6 +56,7 @@
   <package name="python-gst0.10"/>
   <package name="python-gtk2-dev"/>
   <package name="python-gtksourceview2"/>
+  <package name="python-libxml2"/>
   <package name="python-numpy"/>
   <package name="python-pygame"/>
   <package name="python-simplejson"/>
diff --git a/config/sysdeps/ubuntu-9.04.xml b/config/sysdeps/ubuntu-9.04.xml
index e4325f4..e56dda3 100644
--- a/config/sysdeps/ubuntu-9.04.xml
+++ b/config/sysdeps/ubuntu-9.04.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0"?>
 <dependencies>
   <package name="automake1.9"/>
+<!--  <package name="cdbs"/>
+  <package name="debhelper"/>
+  <package name="devscripts"/>
+  <package name="docbook-xsl"/> -->
   <package name="evince"/>
+  <package name="espeak"/>
+  <package name="espeak-data"/>
   <package name="g++"/>
   <package name="gcc"/>
   <package name="gettext"/>
   <package name="gnome-common"/>
   <package name="gnome-doc-utils"/>
   <package name="gnome-icon-theme"/>
+  <package name="gstreamer0.10-plugins-base"/>
+  <package name="gstreamer0.10-plugins-good"/>
   <package name="gtk-doc-tools"/>
   <package name="icon-naming-utils"/>
   <package name="icon-slicer"/>
@@ -16,10 +24,12 @@
   <package name="libavahi-gobject-dev"/>
   <package name="libboost-dev"/>
   <package name="libcroco3-dev"/>
+  <package name="libcsound64-dev"/>
   <package name="libdbus-1-dev"/>
   <package name="libdbus-glib-1-dev"/>
   <package name="libenchant-dev"/>
   <package name="libexpat1-dev"/>
+  <package name="libffi-dev"/>
   <package name="libfribidi-dev"/>
   <package name="libgconf2-dev"/>
   <package name="libglade2-dev"/>
@@ -30,21 +40,28 @@
   <package name="libgtk2.0-dev"/>
   <package name="libidl-dev"/>
   <package name="libloudmouth1-dev"/>
+<!--  <package name="libnspr4-dev"/> -->
   <package name="libpoppler-dev"/>
   <package name="libpoppler-glib-dev"/>
   <package name="libpopt-dev"/>
   <package name="librsvg2-dev"/>
   <package name="libsoup2.4-dev" source="libsoup"/>
+<!--  <package name="libsqlite3-dev"/> -->
   <package name="libtool"/>
+<!--  <package name="libwnck-dev"/> -->
   <package name="libwv-dev"/>
   <package name="libxapian15"/>
   <package name="libxt-dev"/>
   <package name="make"/>
+<!--  <package name="patchutils"/> -->
   <package name="python-avahi"/>
   <package name="python-cairo-dev"/>
+<!--  <package name="python-central"/> -->
   <package name="python-cjson"/>
+  <package name="python-csound"/>
   <package name="python-dbus"/>
   <package name="python-dev"/>
+  <package name="python-empy"/>
   <package name="python-gconf"/>
   <package name="python-gnome2"/>
   <package name="python-gnome2-desktop" source="gnome-python-desktop"/>
@@ -52,11 +69,14 @@
   <package name="python-gst0.10"/>
   <package name="python-gtk2-dev"/>
   <package name="python-gtksourceview2"/>
+  <package name="python-libxml2"/>
   <package name="python-numpy"/>
   <package name="python-pygame"/>
   <package name="python-simplejson"/>
   <package name="python-vte"/>
   <package name="python-xapian"/>
+<!--  <package name="quilt"/>
+  <package name="shared-mime-info"/> -->
   <package name="subversion"/>
   <package name="unzip"/>
   <package name="x11-utils"/>