=== Released 1.1.5 ===

Tue Dec 10 14:51:01 2002  Owen Taylor  <otaylor@redhat.com>

        * === Released 1.1.5 ===

        * configure.in: Version 1.1.5, interface age 1.

        * NEWS: Update.

9 files changed, 71 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index f534429d..ecd8a083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Dec 10 14:51:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.5 ===
+
+	* configure.in: Version 1.1.5, interface age 1.
+
+	* NEWS: Update.
+
 Sun Dec  8 22:57:55 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c: Draw the unknown glyph box with
@@ -45,12 +53,6 @@ Fri Dec  6 23:07:58 2002  Owen Taylor  <otaylor@redhat.com>
 	  pango/pangox.c (pango_x_render): Roughly clip glyphs
 	into the X coordinate area to avoid wrap-around. (#73199)
 
-Fri Dec  6 22:30:17 2002  Owen Taylor  <otaylor@redhat.com>
-
-	* pango/pangoxft-font.c (pango_xft_real_render): 
-	   pango/pangox.c (pango_x_render):  Truncate rendering
-	after 32768 pixels to avoid the possiblity of wrapping.
-
 Fri Dec  6 19:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/modules.c (map_get_submap): Dynamically allocate
@@ -65,7 +67,7 @@ Fri Dec  6 18:58:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 Fri Dec  6 18:30:36 2002  Owen Taylor  <otaylor@redhat.com>
 
-	* pango/pango-utils.c: Convert literal UTF-8 to hex
+	* pango/pango-utils.c: Convert literal UTF-8 to octal
 	escapes. (#92050, Arnaud Charlet)
 
 	* pango/testfonts.c: Convert literal ISO-8859-1
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index f534429d..ecd8a083 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Tue Dec 10 14:51:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.5 ===
+
+	* configure.in: Version 1.1.5, interface age 1.
+
+	* NEWS: Update.
+
 Sun Dec  8 22:57:55 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c: Draw the unknown glyph box with
@@ -45,12 +53,6 @@ Fri Dec  6 23:07:58 2002  Owen Taylor  <otaylor@redhat.com>
 	  pango/pangox.c (pango_x_render): Roughly clip glyphs
 	into the X coordinate area to avoid wrap-around. (#73199)
 
-Fri Dec  6 22:30:17 2002  Owen Taylor  <otaylor@redhat.com>
-
-	* pango/pangoxft-font.c (pango_xft_real_render): 
-	   pango/pangox.c (pango_x_render):  Truncate rendering
-	after 32768 pixels to avoid the possiblity of wrapping.
-
 Fri Dec  6 19:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/modules.c (map_get_submap): Dynamically allocate
@@ -65,7 +67,7 @@ Fri Dec  6 18:58:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 Fri Dec  6 18:30:36 2002  Owen Taylor  <otaylor@redhat.com>
 
-	* pango/pango-utils.c: Convert literal UTF-8 to hex
+	* pango/pango-utils.c: Convert literal UTF-8 to octal
 	escapes. (#92050, Arnaud Charlet)
 
 	* pango/testfonts.c: Convert literal ISO-8859-1
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index f534429d..ecd8a083 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+Tue Dec 10 14:51:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.5 ===
+
+	* configure.in: Version 1.1.5, interface age 1.
+
+	* NEWS: Update.
+
 Sun Dec  8 22:57:55 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c: Draw the unknown glyph box with
@@ -45,12 +53,6 @@ Fri Dec  6 23:07:58 2002  Owen Taylor  <otaylor@redhat.com>
 	  pango/pangox.c (pango_x_render): Roughly clip glyphs
 	into the X coordinate area to avoid wrap-around. (#73199)
 
-Fri Dec  6 22:30:17 2002  Owen Taylor  <otaylor@redhat.com>
-
-	* pango/pangoxft-font.c (pango_xft_real_render): 
-	   pango/pangox.c (pango_x_render):  Truncate rendering
-	after 32768 pixels to avoid the possiblity of wrapping.
-
 Fri Dec  6 19:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/modules.c (map_get_submap): Dynamically allocate
@@ -65,7 +67,7 @@ Fri Dec  6 18:58:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 Fri Dec  6 18:30:36 2002  Owen Taylor  <otaylor@redhat.com>
 
-	* pango/pango-utils.c: Convert literal UTF-8 to hex
+	* pango/pango-utils.c: Convert literal UTF-8 to octal
 	escapes. (#92050, Arnaud Charlet)
 
 	* pango/testfonts.c: Convert literal ISO-8859-1
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index f534429d..ecd8a083 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Tue Dec 10 14:51:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.5 ===
+
+	* configure.in: Version 1.1.5, interface age 1.
+
+	* NEWS: Update.
+
 Sun Dec  8 22:57:55 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c: Draw the unknown glyph box with
@@ -45,12 +53,6 @@ Fri Dec  6 23:07:58 2002  Owen Taylor  <otaylor@redhat.com>
 	  pango/pangox.c (pango_x_render): Roughly clip glyphs
 	into the X coordinate area to avoid wrap-around. (#73199)
 
-Fri Dec  6 22:30:17 2002  Owen Taylor  <otaylor@redhat.com>
-
-	* pango/pangoxft-font.c (pango_xft_real_render): 
-	   pango/pangox.c (pango_x_render):  Truncate rendering
-	after 32768 pixels to avoid the possiblity of wrapping.
-
 Fri Dec  6 19:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/modules.c (map_get_submap): Dynamically allocate
@@ -65,7 +67,7 @@ Fri Dec  6 18:58:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 Fri Dec  6 18:30:36 2002  Owen Taylor  <otaylor@redhat.com>
 
-	* pango/pango-utils.c: Convert literal UTF-8 to hex
+	* pango/pango-utils.c: Convert literal UTF-8 to octal
 	escapes. (#92050, Arnaud Charlet)
 
 	* pango/testfonts.c: Convert literal ISO-8859-1
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index f534429d..ecd8a083 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Tue Dec 10 14:51:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.5 ===
+
+	* configure.in: Version 1.1.5, interface age 1.
+
+	* NEWS: Update.
+
 Sun Dec  8 22:57:55 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c: Draw the unknown glyph box with
@@ -45,12 +53,6 @@ Fri Dec  6 23:07:58 2002  Owen Taylor  <otaylor@redhat.com>
 	  pango/pangox.c (pango_x_render): Roughly clip glyphs
 	into the X coordinate area to avoid wrap-around. (#73199)
 
-Fri Dec  6 22:30:17 2002  Owen Taylor  <otaylor@redhat.com>
-
-	* pango/pangoxft-font.c (pango_xft_real_render): 
-	   pango/pangox.c (pango_x_render):  Truncate rendering
-	after 32768 pixels to avoid the possiblity of wrapping.
-
 Fri Dec  6 19:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/modules.c (map_get_submap): Dynamically allocate
@@ -65,7 +67,7 @@ Fri Dec  6 18:58:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 Fri Dec  6 18:30:36 2002  Owen Taylor  <otaylor@redhat.com>
 
-	* pango/pango-utils.c: Convert literal UTF-8 to hex
+	* pango/pango-utils.c: Convert literal UTF-8 to octal
 	escapes. (#92050, Arnaud Charlet)
 
 	* pango/testfonts.c: Convert literal ISO-8859-1
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index f534429d..ecd8a083 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Tue Dec 10 14:51:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.5 ===
+
+	* configure.in: Version 1.1.5, interface age 1.
+
+	* NEWS: Update.
+
 Sun Dec  8 22:57:55 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pangox.c: Draw the unknown glyph box with
@@ -45,12 +53,6 @@ Fri Dec  6 23:07:58 2002  Owen Taylor  <otaylor@redhat.com>
 	  pango/pangox.c (pango_x_render): Roughly clip glyphs
 	into the X coordinate area to avoid wrap-around. (#73199)
 
-Fri Dec  6 22:30:17 2002  Owen Taylor  <otaylor@redhat.com>
-
-	* pango/pangoxft-font.c (pango_xft_real_render): 
-	   pango/pangox.c (pango_x_render):  Truncate rendering
-	after 32768 pixels to avoid the possiblity of wrapping.
-
 Fri Dec  6 19:42:33 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/modules.c (map_get_submap): Dynamically allocate
@@ -65,7 +67,7 @@ Fri Dec  6 18:58:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 Fri Dec  6 18:30:36 2002  Owen Taylor  <otaylor@redhat.com>
 
-	* pango/pango-utils.c: Convert literal UTF-8 to hex
+	* pango/pango-utils.c: Convert literal UTF-8 to octal
 	escapes. (#92050, Arnaud Charlet)
 
 	* pango/testfonts.c: Convert literal ISO-8859-1
diff --git a/NEWS b/NEWS
index ba0ed824..1de96a4d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Changes between 1.1.4 and 1.1.5
+
+* Fix wrap-around coordinate problems for X, Xt.
+* Draw unknown character boxes with X primitives for the
+  X backend instead of hoping for a suitable glyph [Morten Welinder]
+* Fix crash with FT2 arabic shaper from using face->generic.data
+  for two things.
+* For Xft/FT2, give an informative error mesage when no fonts are found.
+* Support shape modules with ranges beyond the BMP [Federic Zhang]
+* Use octal escapes rather than literal UTF-8 [Arnaud Charlet]
+* Use g_[sf]printf where appropriate [Matthias Clasen]
+* Doc improvements [Matthias]
+* Misc build and bug fixes [Tony Graham, Kjartan Maraas]
+
 Changes between 1.1.3 and 1.1.4
 
 * Fix the Arabic-words-broken-by-underlines problem by
diff --git a/configure.in b/configure.in
index 3852484d..d55dbf38 100644
--- a/configure.in
+++ b/configure.in
@@ -17,14 +17,14 @@ dnl set PANGO_BINARY_AGE _and_ PANGO_INTERFACE_AGE to 0.
 dnl The triplet 
 PANGO_MAJOR_VERSION=1
 PANGO_MINOR_VERSION=1
-PANGO_MICRO_VERSION=4
+PANGO_MICRO_VERSION=5
 PANGO_VERSION=$PANGO_MAJOR_VERSION.$PANGO_MINOR_VERSION.$PANGO_MICRO_VERSION
 
 dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2.
 PANGO_API_VERSION=1.0
 
 dnl Number of releases since we've added interfaces
-PANGO_INTERFACE_AGE=0
+PANGO_INTERFACE_AGE=1
 
 dnl Number of releases since we've broken binary compatibility.
 # PANGO_BINARY_AGE=0
diff --git a/docs/tmpl/pango-indic.sgml b/docs/tmpl/pango-indic.sgml
index 333d3ed9..2959576a 100644
--- a/docs/tmpl/pango-indic.sgml
+++ b/docs/tmpl/pango-indic.sgml
@@ -48,7 +48,7 @@ struct.
 @is_vowel_half: determines whether the given character is part of a two-part
 vowel. This is an optional function.
 @vowel_split: returns whether the given vowel can be split and the pieces in
-which it can be split. This is an optional function. 
+which it can be split. This is an optional function.
 
 <!-- ##### FUNCTION pango_indic_shift_vowels ##### -->
 <para>