Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2008-06-02 17:16:26 (GMT)
committer Tomeu Vizoso <tomeu@tomeuvizoso.net>2008-06-02 17:16:26 (GMT)
commit11c9f6a8f30bc15a114cfe6366bdcba6862fa381 (patch)
tree73959d96ef5b65952e894889b67093e70b8830bf /config
parent69241bd51124ac02eb37b0f20d21d1906f706259 (diff)
parentffb225b24c2536c9a44d713742040a8d311f7548 (diff)
Merge branch 'master' of git://dev.laptop.org/sugar-jhbuild
Diffstat (limited to 'config')
-rw-r--r--config/modulesets/fructose.modules4
-rw-r--r--config/sysdeps/fedora-8.xml1
-rw-r--r--config/sysdeps/fedora-9.xml1
3 files changed, 2 insertions, 4 deletions
diff --git a/config/modulesets/fructose.modules b/config/modulesets/fructose.modules
index 2daf678..4d40193 100644
--- a/config/modulesets/fructose.modules
+++ b/config/modulesets/fructose.modules
@@ -35,9 +35,6 @@
<bundle id="log-activity">
<branch repo="dev.laptop.org/projects" />
</bundle>
- <bundle id="tamtam">
- <branch repo="dev.laptop.org/projects" />
- </bundle>
<bundle id="pippy-activity">
<branch repo="dev.laptop.org/projects" />
</bundle>
@@ -52,7 +49,6 @@
<dep package="terminal-activity"/>
<dep package="calculate"/>
<dep package="log-activity"/>
- <dep package="tamtam"/>
<dep package="pippy-activity"/>
</dependencies>
</metamodule>
diff --git a/config/sysdeps/fedora-8.xml b/config/sysdeps/fedora-8.xml
index 07475d8..4a0a2e0 100644
--- a/config/sysdeps/fedora-8.xml
+++ b/config/sysdeps/fedora-8.xml
@@ -25,6 +25,7 @@
<package name="make"/>
<package name="gnome-python2-rsvg"/>
<package name="python-simplejson"/>
+ <package name="librsvg2"/>
<package name="xapian-bindings-python"
source="xapian-bindings"/>
diff --git a/config/sysdeps/fedora-9.xml b/config/sysdeps/fedora-9.xml
index 5a61570..bc11e6b 100644
--- a/config/sysdeps/fedora-9.xml
+++ b/config/sysdeps/fedora-9.xml
@@ -30,6 +30,7 @@
<package name="libglade2-devel"/>
<package name="popt-devel"/>
<package name="gnome-vfs2-devel"/>
+ <package name="librsvg2"/>
<package name="xapian-bindings-python"
source="xapian-bindings"/>