=== Released 1.1.2 ===PANGO_1_1_2

Sun Oct 13 12:35:14 2002  Owen Taylor  <otaylor@redhat.com>

        * === Released 1.1.2 ===

        * configure.in: Version 1.1.2, interface age 0.

        * NEWS: Updates.

8 files changed, 69 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index d01fad88..928b1c68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Oct 13 12:35:14 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.2 ===
+
+	* configure.in: Version 1.1.2, interface age 0.
+
+	* NEWS: Updates.
+
 2002-10-04  Alexander Larsson  <alexl@redhat.com>
 
 	* pango/pango-layout.[ch]:
@@ -241,7 +249,6 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
->>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index d01fad88..928b1c68 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Sun Oct 13 12:35:14 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.2 ===
+
+	* configure.in: Version 1.1.2, interface age 0.
+
+	* NEWS: Updates.
+
 2002-10-04  Alexander Larsson  <alexl@redhat.com>
 
 	* pango/pango-layout.[ch]:
@@ -241,7 +249,6 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
->>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index d01fad88..928b1c68 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+Sun Oct 13 12:35:14 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.2 ===
+
+	* configure.in: Version 1.1.2, interface age 0.
+
+	* NEWS: Updates.
+
 2002-10-04  Alexander Larsson  <alexl@redhat.com>
 
 	* pango/pango-layout.[ch]:
@@ -241,7 +249,6 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
->>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index d01fad88..928b1c68 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Sun Oct 13 12:35:14 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.2 ===
+
+	* configure.in: Version 1.1.2, interface age 0.
+
+	* NEWS: Updates.
+
 2002-10-04  Alexander Larsson  <alexl@redhat.com>
 
 	* pango/pango-layout.[ch]:
@@ -241,7 +249,6 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
->>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index d01fad88..928b1c68 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Sun Oct 13 12:35:14 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.2 ===
+
+	* configure.in: Version 1.1.2, interface age 0.
+
+	* NEWS: Updates.
+
 2002-10-04  Alexander Larsson  <alexl@redhat.com>
 
 	* pango/pango-layout.[ch]:
@@ -241,7 +249,6 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
->>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index d01fad88..928b1c68 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Sun Oct 13 12:35:14 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.2 ===
+
+	* configure.in: Version 1.1.2, interface age 0.
+
+	* NEWS: Updates.
+
 2002-10-04  Alexander Larsson  <alexl@redhat.com>
 
 	* pango/pango-layout.[ch]:
@@ -241,7 +249,6 @@ Wed Aug 28 15:22:14 2002  Eric Mader   <mader@jtcsv.com>
 	* pango/modules/indic/indic-ot-class-tables.c:
 	Change Punjabi script ('punj') to Gurmukhi ('guru')
 	
->>>>>>> 1.602
 Tue Aug 20 17:31:39 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* Released 1.1.1.
diff --git a/NEWS b/NEWS
index 474b7b9d..3fa9c4b8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+Changes between 1.1.1 and 1.1.2
+
+* Add a new wrap mode for PangoLayout - PANGO_WRAP_WORD_CHAR [Alex Larsson]
+* Win32 work [Tor Lillqvist]
+  - Handle choosing the right font for CJK languages based on language tags. 
+  - Fix boxes showing up for tabs [Florent Duguet]
+  - Better handling of finding ASCII font names.
+  - Cygwin compilation fix [Masahiro Sakai]
+  - Fix --with-included-modules on win32 [Arnaud Charlet]
+  - Various build fixes and cleanups
+* Indic module improvements [Eric Mader]
+* Fixes to generic OpenType handling [Eric]
+* Improve language specific charset ordering basic-x11 [James Su, Brian Yuan]
+* Some merges of fixes by Werner Lember to the original 
+  FreeType OpenType code.
+* Robustify and otherwise improve pango_color_parse() [Matthias Clasen]
+* Some cross-compiling fixes [J. Ali Harlow]
+* Bug fix for pango_scan_int() needed for recent GTK+.
+
 Changes between 1.1.0 and 1.1.1
 
 * Merge a lot of the code between the Xft and FT2 backend,
diff --git a/configure.in b/configure.in
index a080d90f..a5c3298a 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=1
+PANGO_MICRO_VERSION=2
 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=1
+PANGO_INTERFACE_AGE=0
 
 dnl Number of releases since we've broken binary compatibility.
 # PANGO_BINARY_AGE=0