=== Released 1.2.1 ===PANGO_1_2_1

Wed Jan 29 12:47:47 2003  Owen Taylor  <otaylor@redhat.com>

        * === Released 1.2.1 ===

        * Pango-1.2.1, interface age 1

        * NEWS: Updates.

8 files changed, 63 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index e2eb4f99..a2563e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan 29 12:47:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.1 ===
+
+	* Pango-1.2.1, interface age 1
+
+	* NEWS: Updates.
+
 2003-01-29  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pango-coverage.c (pango_coverage_get/set):
@@ -23,7 +31,8 @@ Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
 
 2003-01-20  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: merged fix for bug #103917 from HEAD branch.
+	* configure.in: fixed configure output which was wrong in case
+	freetype is available but fontconfig isn't (bug #103917).
 
 2003-01-20  Padraig O'Briain  <padraig.obriain@sun.com>
 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index e2eb4f99..a2563e49 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Wed Jan 29 12:47:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.1 ===
+
+	* Pango-1.2.1, interface age 1
+
+	* NEWS: Updates.
+
 2003-01-29  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pango-coverage.c (pango_coverage_get/set):
@@ -23,7 +31,8 @@ Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
 
 2003-01-20  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: merged fix for bug #103917 from HEAD branch.
+	* configure.in: fixed configure output which was wrong in case
+	freetype is available but fontconfig isn't (bug #103917).
 
 2003-01-20  Padraig O'Briain  <padraig.obriain@sun.com>
 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index e2eb4f99..a2563e49 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Wed Jan 29 12:47:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.1 ===
+
+	* Pango-1.2.1, interface age 1
+
+	* NEWS: Updates.
+
 2003-01-29  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pango-coverage.c (pango_coverage_get/set):
@@ -23,7 +31,8 @@ Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
 
 2003-01-20  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: merged fix for bug #103917 from HEAD branch.
+	* configure.in: fixed configure output which was wrong in case
+	freetype is available but fontconfig isn't (bug #103917).
 
 2003-01-20  Padraig O'Briain  <padraig.obriain@sun.com>
 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index e2eb4f99..a2563e49 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Wed Jan 29 12:47:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.1 ===
+
+	* Pango-1.2.1, interface age 1
+
+	* NEWS: Updates.
+
 2003-01-29  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pango-coverage.c (pango_coverage_get/set):
@@ -23,7 +31,8 @@ Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
 
 2003-01-20  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: merged fix for bug #103917 from HEAD branch.
+	* configure.in: fixed configure output which was wrong in case
+	freetype is available but fontconfig isn't (bug #103917).
 
 2003-01-20  Padraig O'Briain  <padraig.obriain@sun.com>
 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index e2eb4f99..a2563e49 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Wed Jan 29 12:47:47 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.1 ===
+
+	* Pango-1.2.1, interface age 1
+
+	* NEWS: Updates.
+
 2003-01-29  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pango-coverage.c (pango_coverage_get/set):
@@ -23,7 +31,8 @@ Tue Jan 28 15:18:24 2003  Owen Taylor  <otaylor@redhat.com>
 
 2003-01-20  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: merged fix for bug #103917 from HEAD branch.
+	* configure.in: fixed configure output which was wrong in case
+	freetype is available but fontconfig isn't (bug #103917).
 
 2003-01-20  Padraig O'Briain  <padraig.obriain@sun.com>
 
diff --git a/NEWS b/NEWS
index 49ebdf52..4ba143ce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Overview of Changes in Pango 1.2.1
+==================================
+* Handle older TrueType Open Arabic fonts.
+* Make Win32 backend handle a common TrueType font bug [Tor Lillqvist]
+* Fix crash with some non-BMP characters [Morten Welinder]
+* Avoid crashing on font descriptions like " 12" [Padraig O'Briain]
+* Minor build fixes [Rich Burridge, Sven Neumann]
+
+============================================================
 Changes between 1.1.6 and 1.2.0
 
 * Documentation fixes
diff --git a/configure.in b/configure.in
index 73a01004..c224ad62 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=2
-PANGO_MICRO_VERSION=0
+PANGO_MICRO_VERSION=1
 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/fonts.sgml b/docs/tmpl/fonts.sgml
index 15ee3268..e5385006 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -691,6 +691,7 @@ The #PangoFontMapClass structure holds the virtual functions for
 a particular #PangoFontMap implementation.
 </para>
 
+@parent_class: 
 @load_font: a function to load a font with a given description. See
             pango_font_map_load_font()
 @list_families: A function to list available font families. See
@@ -778,6 +779,7 @@ The #PangoFontsetClass structure holds the virtual functions for
 a particular #PangoFontset implementation.
 </para>
 
+@parent_class: 
 @get_font: a function to get the font in the fontset that contains the 
    best glyph for the given unicode character; see pango_fontset_get_font().
 @get_metrics: a function to get overall metric information for the fonts