Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <sascha-org-sugar-git@silbe.org>2009-11-25 21:38:38 (GMT)
committer Sascha Silbe <sascha-org-sugar-git@silbe.org>2009-11-25 21:38:38 (GMT)
commit74c63ee4ad3ad1272201a43c257de16ecaceeeec (patch)
treea78fda3cdd7219f24e92baa755a9d1ee1f57bee3
parent3c2d45696e5625457883a65b61c0233a9791dc0a (diff)
use distro-packaged metacity on Debian squeeze/sid and Ubuntu 9.10
-rw-r--r--config/sysdeps/50debian-unstable.xml1
-rw-r--r--config/sysdeps/50ubuntu-8.10.xml2
-rw-r--r--config/sysdeps/50ubuntu-9.04.xml2
-rw-r--r--config/sysdeps/50ubuntu-9.10.xml1
-rw-r--r--config/sysdeps/debian-family.xml2
5 files changed, 6 insertions, 2 deletions
diff --git a/config/sysdeps/50debian-unstable.xml b/config/sysdeps/50debian-unstable.xml
index e67cbf5..0897b34 100644
--- a/config/sysdeps/50debian-unstable.xml
+++ b/config/sysdeps/50debian-unstable.xml
@@ -2,6 +2,7 @@
<dependencies>
<package name="espeak"/>
<package name="espeak-data"/>
+ <package name="metacity" source="metacity"/>
<package name="python-evince" source="gnome-python-desktop"/>
<!-- <package name="python-metacity" source="gnome-python-desktop"/> -->
<package name="python-rsvg" source="gnome-python-desktop"/>
diff --git a/config/sysdeps/50ubuntu-8.10.xml b/config/sysdeps/50ubuntu-8.10.xml
index b39d08d..531f291 100644
--- a/config/sysdeps/50ubuntu-8.10.xml
+++ b/config/sysdeps/50ubuntu-8.10.xml
@@ -1,4 +1,6 @@
<?xml version="1.0"?>
<dependencies>
+ <package name="libcanberra-gtk-dev"/><!-- for metacity -->
<package name="xulrunner-1.9-dev" source="xulrunner"/><!-- for hulahop -->
+ <package name="zenity"/><!-- for metacity -->
</dependencies>
diff --git a/config/sysdeps/50ubuntu-9.04.xml b/config/sysdeps/50ubuntu-9.04.xml
index 3e1c4a1..6c4d9b9 100644
--- a/config/sysdeps/50ubuntu-9.04.xml
+++ b/config/sysdeps/50ubuntu-9.04.xml
@@ -2,8 +2,10 @@
<dependencies>
<package name="espeak"/>
<package name="espeak-data"/>
+ <package name="libcanberra-gtk-dev"/><!-- for metacity -->
<package name="python-gnome2-desktop" source="gnome-python-desktop"/>
<package name="xulrunner-1.9-dev" source="xulrunner"/><!-- for hulahop -->
+ <package name="zenity"/><!-- for metacity -->
<!-- TODO: check whether we actually need these (not included for Ubuntu 8.10) -->
<package name="python-empy"/>
</dependencies>
diff --git a/config/sysdeps/50ubuntu-9.10.xml b/config/sysdeps/50ubuntu-9.10.xml
index 5512c58..9aaeb2d 100644
--- a/config/sysdeps/50ubuntu-9.10.xml
+++ b/config/sysdeps/50ubuntu-9.10.xml
@@ -2,6 +2,7 @@
<dependencies>
<package name="espeak"/>
<package name="espeak-data"/>
+ <package name="metacity" source="metacity"/>
<package name="xulrunner-1.9.1-dev" source="xulrunner"/><!-- for hulahop -->
<package name="python-evince" source="gnome-python-desktop"/>
diff --git a/config/sysdeps/debian-family.xml b/config/sysdeps/debian-family.xml
index 86ff746..276f8a7 100644
--- a/config/sysdeps/debian-family.xml
+++ b/config/sysdeps/debian-family.xml
@@ -20,7 +20,6 @@
<package name="libasound2-dev"/>
<package name="libavahi-gobject-dev"/>
<package name="libboost-dev"/>
- <package name="libcanberra-gtk-dev"/><!-- for metacity -->
<package name="libcroco3-dev"/>
<package name="libcsound64-dev"/>
<package name="libdbus-1-dev"/>
@@ -76,7 +75,6 @@
<package name="x11-utils"/>
<package name="xserver-xephyr"/>
<package name="xvnc4viewer"/><!-- for sugar-emulator (sugar) -->
- <package name="zenity"/><!-- for metacity -->
<package name="zip"/>
<package name="zlib1g-dev"/>
</dependencies>