[gnome-ostree] 3.6: Drop some now-upstreamed patches

[Colin Walters <walters src gnome org>]

commit ca37f6bbc9a52b71c5e55d8e756318f2915889c2
Author: Colin Walters <walters verbum org>
Date:   Tue May 15 11:22:41 2012 -0400

    3.6: Drop some now-upstreamed patches

 gnomeos-3.6.json |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 55b2c06..d7862c7 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -520,8 +520,7 @@
 		 "patches": ["pulseaudio-autogen.patch"]},
 
 		{"src": "0pointer:libcanberra",
-		 "patches": ["libcanberra-autogen.patch",
-		             "libcanberra-no-lynx.patch"]},
+		 "patches": ["libcanberra-no-lynx.patch"]},
 
 		{"src": "gnome:gsettings-desktop-schemas"},
 
@@ -534,8 +533,7 @@
 		 "branch": "lcms2.3"},
 
 		{"src": "git:git://gitorious.org/colord/master.git",
-		 "name": "colord",
-		 "patches": ["colord-builddir.patch"]},
+		 "name": "colord"},
 
 		{"src": "linuxwacom:libwacom",
 		 "patches": ["libwacom-autogen.patch"]},