=== Released 1.2.4 ===

Mon Aug 25 11:00:46 2003  Owen Taylor  <otaylor@redhat.com>

        * === Released 1.2.4 ===

        * configure.in: Version 1.2.4, interface age 4.

        * configure.in: chmod +x tests/runtests.sh.

        * NEWS: Updated.

9 files changed, 77 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index e4e9acb3..8367c1cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Aug 25 11:00:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.4 ===
+
+	* configure.in: Version 1.2.4, interface age 4.
+
+	* configure.in: chmod +x tests/runtests.sh.
+
+	* NEWS: Updated.
+
 Mon Aug 25 10:17:21 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index e4e9acb3..8367c1cc 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Mon Aug 25 11:00:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.4 ===
+
+	* configure.in: Version 1.2.4, interface age 4.
+
+	* configure.in: chmod +x tests/runtests.sh.
+
+	* NEWS: Updated.
+
 Mon Aug 25 10:17:21 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index e4e9acb3..8367c1cc 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Mon Aug 25 11:00:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.4 ===
+
+	* configure.in: Version 1.2.4, interface age 4.
+
+	* configure.in: chmod +x tests/runtests.sh.
+
+	* NEWS: Updated.
+
 Mon Aug 25 10:17:21 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index e4e9acb3..8367c1cc 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Mon Aug 25 11:00:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.4 ===
+
+	* configure.in: Version 1.2.4, interface age 4.
+
+	* configure.in: chmod +x tests/runtests.sh.
+
+	* NEWS: Updated.
+
 Mon Aug 25 10:17:21 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index e4e9acb3..8367c1cc 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Mon Aug 25 11:00:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.4 ===
+
+	* configure.in: Version 1.2.4, interface age 4.
+
+	* configure.in: chmod +x tests/runtests.sh.
+
+	* NEWS: Updated.
+
 Mon Aug 25 10:17:21 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/NEWS b/NEWS
index 1f201ff4..87b8a455 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,24 @@
-Overview of Changes in Pango 1.2.2
+Overview of Changes in Pango 1.2.4
+==================================
+* Win32 [Tor Lillqvist]
+  - Avoid calling Uniscribe when not necessary [Hans Breuer]
+  - Build fixes
+* Indic shaper
+  - Add pre-base-matra fixup code from ICU [Sivaraj Doddannan]
+  - Port of Bengali rendering fix from ICU [Taneem Ahmed]
+* OpenType
+  - Port various fixes by Werner Lember from FreeType version
+  - Port various fixes by Lars Knoll from Qt version
+  - Many other bug fixes [Kailash C. Chowksey, Me]
+* Fix bugs in FT2 rendering code [Sven Neumann]
+* Remove Qt-based example program; was causing compilation problems 
+  for a lot of people.
+* Doc fixes [Noah Levitt]
+* Misc bug fixes [Dave Cuthbert, Damon Chaplin, Christophe Fergeau,
+  Tony Graham, Morten Welinder]
+* Build fixes [Sven Neumann, Benedikt Spranger]
+
+Overview of Changes in Pango 1.2.3
 ==================================
 * Fix operation with --disable-debug [Jeff Waugh]
 * Improve handling of ink rectangle extents for empty runs
diff --git a/configure.in b/configure.in
index d60cacbf..5e229309 100644
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ dnl
 dnl The triplet 
 m4_define([pango_major_version],1)
 m4_define([pango_minor_version],2)
-m4_define([pango_micro_version],3)
+m4_define([pango_micro_version],4)
 
 PANGO_MAJOR_VERSION=pango_major_version()
 PANGO_MINOR_VERSION=pango_minor_version()
@@ -34,7 +34,7 @@ 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=3
+PANGO_INTERFACE_AGE=4
 
 dnl Number of releases since we've broken binary compatibility.
 # PANGO_BINARY_AGE=0
@@ -712,7 +712,7 @@ pangoft2-uninstalled.pc
 pangoxft-uninstalled.pc
 pango-zip.sh
 ],[case "$CONFIG_FILES" in
-*pango-config*)chmod +x pango-config;;
+*tests/runtests.sh*)chmod +x tests/runtests.sh;;
 esac])
 	
 backends=""
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index ac0583c8..deec7ade 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -171,7 +171,7 @@ by the structure which simplifies memory management.
 </para>
 
 @num_glyphs: the number of glyphs in the string.
-@glyphs: an array of #PangoGlyphInfo structures of length <structfield>num_glyphs</structfield>. 
+@glyphs: an array of #PangoGlyphInfo structures of length <structfield>num_glyphs</structfield>.
 @log_clusters: for each glyph, byte index of the starting character for the
 cluster. The indices are relative to the start of the text
 corresponding to the PangoGlyphString.
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index 8f06a701..9a7ef804 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -23,6 +23,7 @@ The #PangoContext structure stores global information
 used to control the itemization process. 
 </para>
 
+
 <!-- ##### STRUCT PangoItem ##### -->
 <para>
 The #PangoItem structure stores information about
@@ -30,7 +31,7 @@ a segment of text. It contains the following fields:
 </para>
 
 @offset: the offset of the segment from the beginning of the
-         string in bytes. 
+         string in bytes.
 @length: the length of the segment in bytes.
 @num_chars: the length of the segment in characters.
 @analysis: the properties of the segment.