From 91caa8e59f63ba4bd0a89d0c07d056c51e775621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 20 May 2011 18:16:48 +0200
Subject: [PATCH] build: Add colord to moduleset

It has been added as a dependency of gnome-control-center.
---
 tools/build/gnome-shell-build-setup.sh |  6 +++---
 tools/build/gnome-shell.modules        | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh
index af0930aa9..afcf40ec5 100755
--- a/tools/build/gnome-shell-build-setup.sh
+++ b/tools/build/gnome-shell-build-setup.sh
@@ -63,7 +63,7 @@ fi
 # spidermonkey ({mozilla,firefox,xulrunner}-js), startup-notification,
 # xdamage, icon-naming-utils, upower, libtool-ltdl, libvorbis,
 # libgcrypt, libtasn1, libgnome-keyring, libgtop, cups,
-# libusb, libproxy, libdb, libproxy, sqlite
+# libusb, libproxy, libdb, libproxy, sqlite, gudev, lcms2, sane
 #
 # Non-devel packages needed by gnome-shell and its deps:
 # glxinfo, gstreamer-plugins-base, gstreamer-plugins-good,
@@ -83,7 +83,7 @@ if test "x$system" = xUbuntu -o "x$system" = xDebian -o "x$system" = xLinuxMint
     libgstreamer0.10-dev gstreamer0.10-plugins-base gstreamer0.10-plugins-good
     libltdl-dev libvorbis-dev iso-codes libgnome-keyring-dev libusb-1.0-0-dev
     libupower-glib-dev libcups2-dev libproxy-dev libdb-dev libproxy-dev
-    libsqlite3-dev
+    libsqlite3-dev libgudev-1.0-dev libsane-dev
     "
 
   if apt-cache show autopoint > /dev/null 2> /dev/null; then
@@ -122,7 +122,7 @@ if test "x$system" = xFedora ; then
     icon-naming-utils upower-devel libtool-ltdl-devel libvorbis-devel
     iso-codes-devel libgcrypt-devel libtasn1-devel libtasn1-tools libusb1-devel
     libgnome-keyring-devel libgtop2-devel cups-devel db4-devel libproxy-devel
-    sqlite-devel
+    sqlite-devel libgudev1-devel lcms2-devel sane-backends-devel
     "
 
   if expr $version \>= 14 > /dev/null ; then
diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
index dd58ba4a3..fa8fd1d4e 100644
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -13,6 +13,8 @@
       href="http://0pointer.de/lennart/projects/"/>
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org"/>
+  <repository type="git" name="colord.gitorious.org"
+      href="git://gitorious.org/colord/master.git"/>
 
   <autotools id="gobject-introspection">
     <branch repo="git.gnome.org" module="gobject-introspection"/>
@@ -194,9 +196,22 @@
       <dep package="libcanberra"/>
       <dep package="gnome-desktop-3"/>
       <dep package="gnome-settings-daemon"/>
+      <dep package="colord"/>
     </dependencies>
   </autotools>
 
+  <autotools id="colord" autogenargs="--disable-examples">
+    <branch repo="colord.gitorious.org" checkoutdir="colord" module="master"/>
+    <dependencies>
+      <dep package="glib"/>
+      <!-- and cups -->
+      <!-- and sane -->
+    </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+    </suggests>
+  </autotools>
+
   <autotools id="glib-networking">
     <branch repo="git.gnome.org" module="glib-networking"/>
     <dependencies>