From 7d233241f1def912ab0a7688777482f6b4a4e7b6 Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Mon, 16 May 2011 16:04:27 +0100
Subject: [PATCH] Fix include location for cogl-pango.h

In Cogl, cogl-pango.h has moved to <cogl-pango/cogl-pango.h>. When
using the experimental 2.0 API (which Clutter does) it is no longer
possible to include it under the old name of <cogl/cogl-pango.h> so we
need to update the include location.
---
 clutter/clutter-main.c                | 2 +-
 clutter/clutter-private.h             | 2 +-
 clutter/clutter-text.c                | 2 +-
 doc/cookbook/examples/text-shadow.c   | 2 +-
 tests/interactive/test-box-layout.c   | 2 +-
 tests/interactive/test-table-layout.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 2728f0346..b7a63f472 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -110,7 +110,7 @@
 #include "clutter-version.h" 	/* For flavour define */
 
 #include <cogl/cogl.h>
-#include <cogl/cogl-pango.h>
+#include <cogl-pango/cogl-pango.h>
 
 #include "cally.h" /* For accessibility support */
 
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index bb81b7e22..a9fc004c0 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -30,7 +30,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <cogl/cogl-pango.h>
+#include <cogl-pango/cogl-pango.h>
 
 #include "clutter-backend.h"
 #include "clutter-effect.h"
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index 258ad6a02..bf784eb63 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -56,7 +56,7 @@
 #include "clutter-keysyms.h"
 #include "clutter-main.h"
 #include "clutter-marshal.h"
-#include "clutter-private.h"    /* includes pango/cogl-pango.h */
+#include "clutter-private.h"    /* includes <cogl-pango/cogl-pango.h> */
 #include "clutter-profile.h"
 #include "clutter-units.h"
 
diff --git a/doc/cookbook/examples/text-shadow.c b/doc/cookbook/examples/text-shadow.c
index b73bae1d3..1488f8172 100644
--- a/doc/cookbook/examples/text-shadow.c
+++ b/doc/cookbook/examples/text-shadow.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <cogl/cogl.h>
-#include <cogl-pango.h>
+#include <cogl-pango/cogl-pango.h>
 #include <clutter/clutter.h>
 
 #define SHADOW_X_OFFSET         3
diff --git a/tests/interactive/test-box-layout.c b/tests/interactive/test-box-layout.c
index e354fafbb..893652f89 100644
--- a/tests/interactive/test-box-layout.c
+++ b/tests/interactive/test-box-layout.c
@@ -23,7 +23,7 @@
 
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
-#include <cogl/cogl-pango.h>
+#include <cogl-pango/cogl-pango.h>
 
 #define INSTRUCTIONS \
         "Press v\t\342\236\236\tSwitch horizontal/vertical\n"           \
diff --git a/tests/interactive/test-table-layout.c b/tests/interactive/test-table-layout.c
index d0a0312d9..209659b48 100644
--- a/tests/interactive/test-table-layout.c
+++ b/tests/interactive/test-table-layout.c
@@ -5,7 +5,7 @@
 
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
-#include <cogl/cogl-pango.h>
+#include <cogl-pango/cogl-pango.h>
 
 #define FONT "Sans 12"