Move the code from pango/ to pango2/

Life is easier if the src path matches the installed
header path prefix, so make them match. Update all
users.

30 files changed, 37 insertions, 38 deletions

diff --git a/tests/cxx-test.cpp b/tests/cxx-test.cpp
index ac72a8b3..3fa1c20d 100644
--- a/tests/cxx-test.cpp
+++ b/tests/cxx-test.cpp
@@ -2,10 +2,10 @@
  * and compiled in a C++ program.
  */
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #if PANGO_RENDERING_CAIRO
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 #endif
 
 int
diff --git a/tests/dump-boundaries.c b/tests/dump-boundaries.c
index 467e637b..5e98123c 100644
--- a/tests/dump-boundaries.c
+++ b/tests/dump-boundaries.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #define CHFORMAT "%0#6x"
 
diff --git a/tests/markup-parse.c b/tests/markup-parse.c
index a8de714d..35ea03b2 100644
--- a/tests/markup-parse.c
+++ b/tests/markup-parse.c
@@ -30,7 +30,7 @@
 
 #include <locale.h>
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
 static void
diff --git a/tests/test-bidi.c b/tests/test-bidi.c
index db128279..11df1758 100644
--- a/tests/test-bidi.c
+++ b/tests/test-bidi.c
@@ -20,7 +20,7 @@
  */
 
 #include <locale.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static Pango2Context *context;
 
diff --git a/tests/test-break.c b/tests/test-break.c
index 23caba69..933c20cf 100644
--- a/tests/test-break.c
+++ b/tests/test-break.c
@@ -28,7 +28,7 @@
 #endif
 
 #include "config.h"
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 #include "validate-log-attrs.h"
 
diff --git a/tests/test-common.c b/tests/test-common.c
index 84dfbef9..aa51378a 100644
--- a/tests/test-common.c
+++ b/tests/test-common.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 #include "test-common.h"
 
 #include <hb-ot.h>
diff --git a/tests/test-ellipsize.c b/tests/test-ellipsize.c
index a469cb63..b01a9441 100644
--- a/tests/test-ellipsize.c
+++ b/tests/test-ellipsize.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
 static Pango2Context *context;
diff --git a/tests/test-font.c b/tests/test-font.c
index e37d0a63..dd3ef1b5 100644
--- a/tests/test-font.c
+++ b/tests/test-font.c
@@ -24,9 +24,9 @@
 #include <locale.h>
 
 #include <gio/gio.h>
-#include <pango/pango.h>
-#include <pango/pango-item-private.h>
-#include <pango/pango-font-private.h>
+#include <pango2/pango.h>
+#include <pango2/pango-item-private.h>
+#include <pango2/pango-font-private.h>
 
 #include "test-common.h"
 
diff --git a/tests/test-fontsets.c b/tests/test-fontsets.c
index 339411c9..fda49cfc 100644
--- a/tests/test-fontsets.c
+++ b/tests/test-fontsets.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <locale.h>
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
 static gboolean
diff --git a/tests/test-harfbuzz.c b/tests/test-harfbuzz.c
index 4d4fd7be..dcd7ca4b 100644
--- a/tests/test-harfbuzz.c
+++ b/tests/test-harfbuzz.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <gio/gio.h>
 #include "test-common.h"
 
diff --git a/tests/test-itemize.c b/tests/test-itemize.c
index d7b4074c..a13ceaee 100644
--- a/tests/test-itemize.c
+++ b/tests/test-itemize.c
@@ -29,11 +29,11 @@
 #endif
 
 #include "config.h"
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
-#include "pango/pango-attr-private.h"
-#include "pango/pango-item-private.h"
+#include "pango2/pango-attr-private.h"
+#include "pango2/pango-item-private.h"
 
 
 static Pango2Context *context;
diff --git a/tests/test-layout.c b/tests/test-layout.c
index 868806df..5146416a 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #endif
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
 #include <hb-ot.h>
diff --git a/tests/test-pangocairo-threads.c b/tests/test-pangocairo-threads.c
index 4db903c2..47a49081 100644
--- a/tests/test-pangocairo-threads.c
+++ b/tests/test-pangocairo-threads.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include <pango/pango.h>
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 #include "test-common.h"
 
diff --git a/tests/test-shape.c b/tests/test-shape.c
index 8f0732f6..dc4f01af 100644
--- a/tests/test-shape.c
+++ b/tests/test-shape.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "config.h"
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 #include "test-common.h"
 
 
diff --git a/tests/testattributes.c b/tests/testattributes.c
index 13db3b97..b256eb8b 100644
--- a/tests/testattributes.c
+++ b/tests/testattributes.c
@@ -19,8 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <pango/pango.h>
-#include <pango/pango-attr-private.h>
+#include <pango2/pango.h>
+#include <pango2/pango-attr-private.h>
 
 static void
 test_copy (Pango2Attribute *attr)
diff --git a/tests/testboundaries.c b/tests/testboundaries.c
index 1deaa65d..eb6a8207 100644
--- a/tests/testboundaries.c
+++ b/tests/testboundaries.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #ifndef G_OS_WIN32
 #include <unistd.h>
diff --git a/tests/testboundaries_ucd.c b/tests/testboundaries_ucd.c
index 64fa66ff..b34f7573 100644
--- a/tests/testboundaries_ucd.c
+++ b/tests/testboundaries_ucd.c
@@ -20,10 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <pango/pango.h>
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
+#include <pango2/pango.h>
 
 static gboolean failed = FALSE;
 
diff --git a/tests/testcolor.c b/tests/testcolor.c
index 125d1023..d783844b 100644
--- a/tests/testcolor.c
+++ b/tests/testcolor.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 typedef struct _ColorSpec {
   const char *spec;
diff --git a/tests/testcontext.c b/tests/testcontext.c
index 59517e57..05917d52 100644
--- a/tests/testcontext.c
+++ b/tests/testcontext.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static void
 test_set_language (void)
diff --git a/tests/testhbfont.c b/tests/testhbfont.c
index 9f6e76ce..88fc3ef6 100644
--- a/tests/testhbfont.c
+++ b/tests/testhbfont.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #include <glib.h>
 #include <gio/gio.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #include <hb-ot.h>
 
diff --git a/tests/testiter.c b/tests/testiter.c
index b180f66f..007608df 100644
--- a/tests/testiter.c
+++ b/tests/testiter.c
@@ -30,7 +30,7 @@
 
 #include <glib.h>
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static void verbose (const char *format, ...) G_GNUC_PRINTF (1, 2);
 static void
diff --git a/tests/testlanguage.c b/tests/testlanguage.c
index 1a6f238a..14329ac4 100644
--- a/tests/testlanguage.c
+++ b/tests/testlanguage.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static void
 test_language_to_string (void)
diff --git a/tests/testmatrix.c b/tests/testmatrix.c
index 0549764c..c0b7e47d 100644
--- a/tests/testmatrix.c
+++ b/tests/testmatrix.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <math.h>
 
 #define matrix_equal(m1, m2) \
diff --git a/tests/testmisc.c b/tests/testmisc.c
index 32efb932..cecec9bb 100644
--- a/tests/testmisc.c
+++ b/tests/testmisc.c
@@ -21,8 +21,8 @@
 
 #include "config.h"
 #include <glib.h>
-#include <pango/pangocairo.h>
-#include <pango/pango-item-private.h>
+#include <pango2/pangocairo.h>
+#include <pango2/pango-item-private.h>
 
 /* Test that itemizing a string with 0 characters works
  */
diff --git a/tests/testrandom.c b/tests/testrandom.c
index 8d7b19c4..5de90d08 100644
--- a/tests/testrandom.c
+++ b/tests/testrandom.c
@@ -23,7 +23,7 @@
 
 #include <locale.h>
 #include <gio/gio.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #define N_SENTENCES 20
 
diff --git a/tests/testscript.c b/tests/testscript.c
index 435c9d4e..05d30a38 100644
--- a/tests/testscript.c
+++ b/tests/testscript.c
@@ -58,7 +58,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "pango/pango-script.h"
+#include "pango2/pango-script.h"
 
 typedef struct
 {
diff --git a/tests/testserialize.c b/tests/testserialize.c
index 60333d1f..6ee21da8 100644
--- a/tests/testserialize.c
+++ b/tests/testserialize.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <gio/gio.h>
 
 #include "test-common.h"
diff --git a/tests/testtabs.c b/tests/testtabs.c
index 873c2427..7e33cb86 100644
--- a/tests/testtabs.c
+++ b/tests/testtabs.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static void
 test_tabs_basic (void)
diff --git a/tests/validate-log-attrs.c b/tests/validate-log-attrs.c
index 16c9817f..369c7729 100644
--- a/tests/validate-log-attrs.c
+++ b/tests/validate-log-attrs.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "validate-log-attrs.h"
-#include "pango.h"
+#include <pango2/pango.h>
 #include <string.h>
 
 /* {{{ Validation */
diff --git a/tests/validate-log-attrs.h b/tests/validate-log-attrs.h
index dcdf0b09..e9991d14 100644
--- a/tests/validate-log-attrs.h
+++ b/tests/validate-log-attrs.h
@@ -25,7 +25,7 @@
 
 G_BEGIN_DECLS
 
-#include <pango/pango-item.h>
+#include <pango2/pango-item.h>
 
 #define PANGO2_VALIDATE_ERROR (pango2_validate_error_quark ())