[gnome-ostree] manifest: Update to latest colord, untag bits

[Colin Walters <walters src gnome org>]

commit 038dcba07bc23103b775f15ca3f97e0ef11e3245
Author: Colin Walters <walters verbum org>
Date:   Fri Jan 4 21:18:55 2013 -0500

    manifest: Update to latest colord, untag bits

 manifest.json                   |    9 ++++-----
 patches/colord-builddir-2.patch |   30 ++++++++++++++++++++++++++++++
 patches/colord-builddir.patch   |   29 -----------------------------
 3 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 6c86a5d..237c719 100644
--- a/manifest.json
+++ b/manifest.json
@@ -625,11 +625,12 @@
 		 "tag": "lcms2.3"},
 
                 {"src": "git:git://gitorious.org/gusb/gusb.git"},
-
+		
 		{"src": "git:git://gitorious.org/colord/master.git",
-		 "tag": "3811bdbdce232f3af01b9ededa86a10d244e8f58",
 		 "name": "colord",
-		 "patches": ["colord-disable-private-tmp.patch"]},
+		 "config-opts": ["--disable-print-profiles"],
+		 "patches": ["colord-disable-private-tmp.patch",
+		             "colord-builddir-2.patch"]},
 
 		{"src": "linuxwacom:libwacom",
 		 "patches": ["libwacom-autogen.patch"]},
@@ -797,7 +798,6 @@
 				 "--disable-man"]},
 
 		{"src": "gnome:gnome-settings-daemon",
-		 "tag": "17f17dd514b0939ba976b9215a2d0d6a9f875f39",
 		 "config-opts": ["--disable-packagekit",
 		                 "--disable-cups",
 		                 "--enable-systemd",
@@ -823,7 +823,6 @@
                 }, 
 
 		{"src": "gnome:gnome-control-center",
-		 "tag": "28ea296f095cbeae69347d7f8e0dd138d0ddbe6b",
 		 "config-opts": ["--disable-documentation",
 				 "--disable-cups"]},
 
diff --git a/patches/colord-builddir-2.patch b/patches/colord-builddir-2.patch
new file mode 100644
index 0000000..46f0bb5
--- /dev/null
+++ b/patches/colord-builddir-2.patch
@@ -0,0 +1,30 @@
+From 0dee82eb4f72da186747cb07e84dda5bc8c8aeac Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Fri, 4 Jan 2013 18:25:15 -0500
+Subject: [PATCH] profiles: Fix srcdir != builddir
+
+---
+ data/profiles/Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/profiles/Makefile.am b/data/profiles/Makefile.am
+index 3af71d1..fd442fe 100644
+--- a/data/profiles/Makefile.am
++++ b/data/profiles/Makefile.am
+@@ -207,11 +207,11 @@ x11-colors.icc:
+ 		create-named-color srgb "X11" ""	\
+ 		--metadata "License=$(license)"		\
+ 		--description "X11 Colors"		\
+-		./x11-colors.csv
++		$(srcdir)/x11-colors.csv
+ crayons.icc:
+ 	$(top_builddir)/client/cd-create-profile --output $@ \
+ 		create-named-color lab "Crayon" ""	\
+-		./crayons.csv				\
++		$(srcdir)/crayons.csv				\
+ 		--metadata "License=$(license)"		\
+ 		--description "Crayon Colors"
+ bluish.icc:
+-- 
+1.7.1
+