From 38c5653d9d6594db91a58ea71aa37c6fcb5ebd6f Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha-pgp@silbe.org>
Date: Sat, 05 Jun 2010 12:28:31 +0000
Subject: Debian: use python-xklavier from distro package

---
diff --git a/config/sysdeps/50debian-unstable.xml b/config/sysdeps/50debian-unstable.xml
index 3177213..e04de63 100644
--- a/config/sysdeps/50debian-unstable.xml
+++ b/config/sysdeps/50debian-unstable.xml
@@ -6,7 +6,6 @@
   <package name="libabiword-2.8-dev" source="abiword"/>
   <package name="libtelepathy-glib0" source="telepathy-glib"/>
   <package name="libdbus-glib-1-dev" source="dbus-glib"/>
-  <package name="libxklavier-dev" source="libxklavier"/>
   <package name="metacity" source="metacity"/>
   <package name="pep8" source="pep8"/>
   <package name="pylint" source="pylint"/>
@@ -16,6 +15,7 @@
   <package name="python-rsvg" source="gnome-python-desktop"/>
   <package name="python-telepathy" source="telepathy-python"/>
   <package name="python-wnck" source="gnome-python-desktop"/>
+  <package name="python-xklavier" source="python-xklavier"/>
   <package name="python-xpcom" source="xulrunner"/>
   <package name="telepathy-gabble" source="telepathy-gabble"/>
   <package name="telepathy-salut" source="telepathy-salut"/>
diff --git a/config/sysdeps/50ubuntu-9.04.xml b/config/sysdeps/50ubuntu-9.04.xml
index fc5b351..f286557 100644
--- a/config/sysdeps/50ubuntu-9.04.xml
+++ b/config/sysdeps/50ubuntu-9.04.xml
@@ -3,7 +3,9 @@
   <package name="automake"/><!-- automake 1.10 for metacity -->
   <package name="espeak"/>
   <package name="espeak-data"/>
+  <package name="iso-codes"/><!-- for libxklavier -->
   <package name="libcanberra-gtk-dev"/><!-- for metacity -->
+  <package name="libxkbfile-dev"/><!-- for libxklavier -->
   <package name="python-gnome2-desktop" source="gnome-python-desktop"/>
   <package name="python-setuptools"/><!-- for pep8 -->
   <package name="xulrunner-1.9-dev" source="xulrunner"/><!-- for hulahop -->
diff --git a/config/sysdeps/debian-family.xml b/config/sysdeps/debian-family.xml
index e6a761c..ce11329 100644
--- a/config/sysdeps/debian-family.xml
+++ b/config/sysdeps/debian-family.xml
@@ -17,7 +17,6 @@
   <package name="icon-naming-utils"/>
   <package name="icon-slicer"/>
   <package name="intltool"/>
-  <package name="iso-codes"/><!-- for libxklavier -->
   <package name="libasound2-dev"/>
   <package name="libavahi-gobject-dev"/>
   <package name="libboost-dev"/>
@@ -46,7 +45,6 @@
   <package name="libtool"/>
   <package name="libwv-dev"/>
   <package name="libxapian15"/>
-  <package name="libxkbfile-dev"/><!-- for libxklavier -->
   <package name="libxt-dev"/>
   <package name="make"/>
   <package name="python-avahi"/>
--
cgit v0.9.1