xulrunner-python-devel: we don't need it at all
xulrunner-devel: not needed since we don't build hulahop from source
dogtail: only needed on systems that build evince
csound-devel: not needed since we don't build csound from source
Tested on Fedora 13, Fedora 12 and Ubuntu 10.04.
Signed-off-by: Bernie Innocenti <ber...@codewiz.org>
---
config/modulesets/tools.modules | 5 -----
config/sysdeps/50fedora-12.xml | 5 +----
config/sysdeps/50fedora-rawhide.xml | 4 +---
config/sysdeps/50ubuntu-10.04.xml | 2 +-
config/sysdeps/debian-family.xml | 1 -
config/sysdeps/fedora-family.xml | 3 +--
config/sysdeps/mandrivalinux-2009.1.xml | 1 -
7 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/config/modulesets/tools.modules b/config/modulesets/tools.modules
index 715c640..88f0ac2 100644
--- a/config/modulesets/tools.modules
+++ b/config/modulesets/tools.modules
@@ -30,17 +30,12 @@
<dep package="logilab-common"/>
</dependencies>
</distutils>
- <distutils id="dogtail">
- <branch repo="fedorahosted"/>
- <!-- sysdep: pyatspi -->
- </distutils>
<distutils id="pep8">
<branch repo="github" module="jcrocholl/pep8"/>
<!-- sysdep: setuptools -->
</distutils>
<metamodule id="meta-tools">
<dependencies>
- <dep package="dogtail"/>
<dep package="pep8"/>
<dep package="pylint"/>
</dependencies>
diff --git a/config/sysdeps/50fedora-12.xml b/config/sysdeps/50fedora-12.xml
index 8cdbc78..eb2bfb4 100644
--- a/config/sysdeps/50fedora-12.xml
+++ b/config/sysdeps/50fedora-12.xml
@@ -1,10 +1,7 @@
<?xml version="1.0"?>
<dependencies>
- <package name="dogtail" source="dogtail"/>
<package name="metacity" source="metacity"/>
<package name="pylint" source="pylint"/>
<package name="python-xklavier" source="python-xklavier"/>
- <package name="xulrunner-devel-unstable" source="xulrunner"/>
- <package name="xulrunner-python" source="xulrunner"/>
- <package name="xulrunner-python-devel" source="xulrunner"/>
+ <package name="xulrunner" source="xulrunner"/>
</dependencies>
diff --git a/config/sysdeps/50fedora-rawhide.xml
b/config/sysdeps/50fedora-rawhide.xml
index 222166b..eb2bfb4 100644
--- a/config/sysdeps/50fedora-rawhide.xml
+++ b/config/sysdeps/50fedora-rawhide.xml
@@ -1,9 +1,7 @@
<?xml version="1.0"?>
<dependencies>
- <package name="dogtail" source="dogtail"/>
<package name="metacity" source="metacity"/>
<package name="pylint" source="pylint"/>
<package name="python-xklavier" source="python-xklavier"/>
- <package name="xulrunner-devel" source="xulrunner"/>
- <package name="xulrunner-python-devel" source="xulrunner"/>
+ <package name="xulrunner" source="xulrunner"/>
</dependencies>
diff --git a/config/sysdeps/50ubuntu-10.04.xml
b/config/sysdeps/50ubuntu-10.04.xml
index a53022d..e7f8452 100644
--- a/config/sysdeps/50ubuntu-10.04.xml
+++ b/config/sysdeps/50ubuntu-10.04.xml
@@ -14,5 +14,5 @@
<package name="python-wnck" source="gnome-python-desktop"/>
<package name="telepathy-gabble" source="telepathy-gabble"/>
<package name="telepathy-salut" source="telepathy-salut"/>
- <package name="xulrunner-1.9.1-dev" source="xulrunner"/><!-- for hulahop -->
+ <package name="xulrunner-1.9" source="xulrunner"/><!-- for hulahop -->
</dependencies>
diff --git a/config/sysdeps/debian-family.xml b/config/sysdeps/debian-family.xml
index 463f4fe..6aae02b 100644
--- a/config/sysdeps/debian-family.xml
+++ b/config/sysdeps/debian-family.xml
@@ -66,7 +66,6 @@
<package name="python-hippocanvas" source="hippo-canvas"/>
<package name="python-libxml2"/>
<package name="python-numpy"/>
- <package name="python-pyatspi"/><!-- for dogtail -->
<package name="python-pygame"/>
<package name="python-simplejson"/>
<package name="python-vte"/><!-- for Terminal -->
diff --git a/config/sysdeps/fedora-family.xml b/config/sysdeps/fedora-family.xml
index 4f98658..c2a2b3d 100644
--- a/config/sysdeps/fedora-family.xml
+++ b/config/sysdeps/fedora-family.xml
@@ -1,12 +1,11 @@
<?xml version="1.0"?>
<dependencies>
<package name="alsa-lib-devel"/>
- <package name="at-spi-python"/><!-- for dogtail -->
<package name="avahi" source="avahi"/>
<package name="avahi-gobject-devel" source="avahi"/>
<package name="avahi-tools" source="avahi"/>
<package name="boost-devel"/>
- <package name="csound-devel"/>
+ <package name="csound"/>
<package name="dbus-devel"/>
<package name="dbus-glib-devel"/>
<package name="dbus-python"/>
diff --git a/config/sysdeps/mandrivalinux-2009.1.xml
b/config/sysdeps/mandrivalinux-2009.1.xml
index 0acac46..e0c6ca2 100644
--- a/config/sysdeps/mandrivalinux-2009.1.xml
+++ b/config/sysdeps/mandrivalinux-2009.1.xml
@@ -52,7 +52,6 @@
<package name="pygame"/>
<package name="pygtk2.0-devel"/>
<package name="python-abiword" source="pyabiword"/>
- <package name="python-at-spi"/><!-- for dogtail -->
<package name="python-cjson"/>
<package name="python-decorator"/>
<package name="python-devel"/>
--
1.7.0.1
_______________________________________________
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
