=== Released 1.12.0 ===PANGO_1_12_0

2006-03-13  Behdad Esfahbod  <behdad@gnome.org>

        * === Released 1.12.0 ===

        * configure.in: Version 1.12.0

        * NEWS, README: Updated.

5 files changed, 42 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c083b95..460e435d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-13  Behdad Esfahbod  <behdad@gnome.org>
+
+	* === Released 1.12.0 ===
+
+	* configure.in: Version 1.12.0
+
+	* NEWS, README: Updated.
+
 2006-03-03  Tor Lillqvist  <tml@novell.com>
 
 	* pango/pangowin32-private.h (PING): Fix compilation error with
diff --git a/NEWS b/NEWS
index 5f132008..7d44cc9b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Overview of changes between 1.11.99 and 1.12.0
+==============================================
+* Compilations fixes for MSVC. [#333115, Tor Lillqvist]
+* More NULL-check against unusable fonts, helps with Win32 fonts without
+  a Unicode cmap. [Tor]
+* Use g_print instead of printf for debugging output in Win32 backend.
+  [#332855, Tor]
+
 Overview of changes between 1.11.6 and 1.11.99
 ==============================================
 * Fix problem recently introduced that made Win32 backend render boxes
diff --git a/README b/README
index e6999d58..dc5c7857 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ the GTK+ widget toolkit as a test platform. Pango forms the core of text
 and font handling for GTK+-2.x.
 
 Pango is designed to be modular; the core Pango layout can be used
-with different font backends. There are two basic backends, with
+with different font backends. There are three basic backends, with
 multiple options for rendering with each.
 
  - Client side fonts using the FreeType and fontconfig libraries.
@@ -16,6 +16,8 @@ multiple options for rendering with each.
    for complex-text handling). Rendering can be done via Cairo 
    or directly using the native Win32 API.
 
+  - Native fonts on MacOS X, rendering via Cairo.
+
 The integration of Pango with Cairo (http://cairographics.org)
 provides a complete solution with high quality text handling 
 and graphics rendering.
@@ -29,12 +31,12 @@ and routines to assist in editing internationalized text.
 
 For more information about Pango, see:
 
- http://www.pango.org
+ http://www.pango.org/
 
 Dependencies
 ============
 
-Pango depends on version 2.10 or newer of the GLib library; more 
+Pango depends on version 2.10.0 or newer of the GLib library; more 
 information about GLib can be found at http://www.gtk.org/.
 
 When using client side fonts, the fontconfig library
@@ -43,18 +45,21 @@ of the FreeType font handling library (http://www.freetype.org) is
 also required.
 
 Cairo support depends on the Cairo library (http://cairographics.org).
+The Cairo backend is the preferred backend to use Pango with and is
+subject of most of the development in the future.  It has the
+advantage that the same code can be used for display and printing.
 
-The supported font backend for X in Pango-1.8 is the Xft backend
-which uses version 2 of the Xft library to manage client
-side fonts. Version 2 of Xft is available from 
-http://xlibs.freedesktop.org/release/. 
-You'll need the libXft package, and possibly the libXrender and 
-renderext packages as well. You'll also need fontconfig (see below.)
+We suggest using Pango with Cairo as described above, but you can also
+do X-specific rendering using the Xft library. The Xft backend uses
+version 2 of the Xft library to manage client side fonts. Version 2 of
+Xft is available from http://xlibs.freedesktop.org/release/.  You'll
+need the libXft package, and possibly the libXrender and renderext
+packages as well.  You'll also need fontconfig (see below.)
 
 Note that an earlier version of Xft is shipped with version
 of XFree86 up to 4.2. This version does not work with Pango-1.8;
 Pango-1.8 requires version 2 of Xft, which is present in XFree86-4.3
-and newer and in X11R6.7 and X11R6.8.
+and X11R6.7 and newer versions of those.
 
 After installing fontconfig, it may be necessary to edit
 the fonts.conf file, found at $(sysconfdir)/fonts/fonts.conf
@@ -82,7 +87,7 @@ GNU Lesser Public License (LGPL) - see the file COPYING for details.
 
 The OpenType code in pango/opentype is derived from the FreeType 
 project (http://www.freetype.org) and is dual-licensed under the 
-GNU Public License and the FreeType license. See see
+GNU General Public License and the FreeType license. See see
 pango/opentype/FT-license.txt for full details of the FreeType 
 license.
 
@@ -93,4 +98,8 @@ README file.
 
 Owen Taylor
 otaylor@redhat.com
-17 June 2005
+
+Behdad Esfahbod
+behdad@gnome.org
+
+13 March 2006
diff --git a/configure.in b/configure.in
index 8966dc53..14ad66ce 100644
--- a/configure.in
+++ b/configure.in
@@ -21,8 +21,8 @@ dnl
 
 dnl The triplet 
 m4_define([pango_major_version], [1])
-m4_define([pango_minor_version], [11])
-m4_define([pango_micro_version], [99])
+m4_define([pango_minor_version], [12])
+m4_define([pango_micro_version], [0])
 m4_define([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.
@@ -363,7 +363,7 @@ fi
 #
 # Checks for GLib
 #
-GLIB_REQUIRED_VERSION=2.9.1
+GLIB_REQUIRED_VERSION=2.10.0
 GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gmodule-no-export-2.0"
 
 PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :,
diff --git a/pango/opentype/README b/pango/opentype/README
index 6deb7f52..20035644 100644
--- a/pango/opentype/README
+++ b/pango/opentype/README
@@ -21,7 +21,7 @@ add support for PangoGlyphString's log_clusters, and in various
 other ways. Bug reports on these files should be sent to 
 gtk-i18n-list@gtk.org, NOT to the freetype maintainers.
 
-The license for these files is in the file freetype-license.txt. 
+The license for these files is in the file FT-license.txt. 
 
 
 Most of the additional files in this directory implement a high-level
@@ -33,4 +33,4 @@ in figuring out what is going on. Please extend to cover additional
 parts of the tables as you encounter fonts using them.
 
 Owen Taylor
-17 December 2000
\ No newline at end of file
+17 December 2000