[Sugar-devel] [PATCH] Shave off unnecessary dependencies from jhbuild

[Bernie Innocenti]

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 <bernie at codewiz.org>
---
 config/modulesets/tools.modules     |    1 -
 config/sysdeps/50fedora-12.xml      |    4 ----
 config/sysdeps/50fedora-rawhide.xml |    3 ---
 config/sysdeps/50ubuntu-10.04.xml   |    2 +-
 config/sysdeps/fedora-family.xml    |    2 +-
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/config/modulesets/tools.modules b/config/modulesets/tools.modules
index 715c640..4dcdd83 100644
--- a/config/modulesets/tools.modules
+++ b/config/modulesets/tools.modules
@@ -40,7 +40,6 @@
   </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..cca3cda 100644
--- a/config/sysdeps/50fedora-12.xml
+++ b/config/sysdeps/50fedora-12.xml
@@ -1,10 +1,6 @@
 <?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"/>
 </dependencies>
diff --git a/config/sysdeps/50fedora-rawhide.xml b/config/sysdeps/50fedora-rawhide.xml
index 222166b..cca3cda 100644
--- a/config/sysdeps/50fedora-rawhide.xml
+++ b/config/sysdeps/50fedora-rawhide.xml
@@ -1,9 +1,6 @@
 <?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"/>
 </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/fedora-family.xml b/config/sysdeps/fedora-family.xml
index 4f98658..43ddbd2 100644
--- a/config/sysdeps/fedora-family.xml
+++ b/config/sysdeps/fedora-family.xml
@@ -6,7 +6,7 @@
   <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"/>
-- 
1.7.0.1