=== Released 1.4.0 ===PANGO_1_4_0

Tue Mar 16 11:24:46 2004  Owen Taylor  <otaylor@redhat.com>

        * === Released 1.4.0 ===

        * configure.in: Version 1.4.0, interface ago 0. Require
        glib-2.4.0.

        * NEWS: Updates.

        * README: Some updates; include details about the FreeType
        license of the OpenType code.

9 files changed, 134 insertions, 55 deletions

diff --git a/ChangeLog b/ChangeLog
index a5ec17be..551d39e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Mar 16 11:24:46 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.4.0 ===
+
+	* configure.in: Version 1.4.0, interface ago 0. Require
+	glib-2.4.0.
+
+	* NEWS: Updates.
+
+	* README: Some updates; include details about the FreeType
+	license of the OpenType code.
+
 Thu Mar 11 17:28:06 2004  Manish Singh  <yosh@gimp.org>
 
 	* pango/pangofc-fontmap.c: Convert PangoStretch to and from FC_WIDTH,
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index a5ec17be..551d39e2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,15 @@
+Tue Mar 16 11:24:46 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.4.0 ===
+
+	* configure.in: Version 1.4.0, interface ago 0. Require
+	glib-2.4.0.
+
+	* NEWS: Updates.
+
+	* README: Some updates; include details about the FreeType
+	license of the OpenType code.
+
 Thu Mar 11 17:28:06 2004  Manish Singh  <yosh@gimp.org>
 
 	* pango/pangofc-fontmap.c: Convert PangoStretch to and from FC_WIDTH,
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index a5ec17be..551d39e2 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,15 @@
+Tue Mar 16 11:24:46 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.4.0 ===
+
+	* configure.in: Version 1.4.0, interface ago 0. Require
+	glib-2.4.0.
+
+	* NEWS: Updates.
+
+	* README: Some updates; include details about the FreeType
+	license of the OpenType code.
+
 Thu Mar 11 17:28:06 2004  Manish Singh  <yosh@gimp.org>
 
 	* pango/pangofc-fontmap.c: Convert PangoStretch to and from FC_WIDTH,
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index a5ec17be..551d39e2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,15 @@
+Tue Mar 16 11:24:46 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.4.0 ===
+
+	* configure.in: Version 1.4.0, interface ago 0. Require
+	glib-2.4.0.
+
+	* NEWS: Updates.
+
+	* README: Some updates; include details about the FreeType
+	license of the OpenType code.
+
 Thu Mar 11 17:28:06 2004  Manish Singh  <yosh@gimp.org>
 
 	* pango/pangofc-fontmap.c: Convert PangoStretch to and from FC_WIDTH,
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index a5ec17be..551d39e2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,15 @@
+Tue Mar 16 11:24:46 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.4.0 ===
+
+	* configure.in: Version 1.4.0, interface ago 0. Require
+	glib-2.4.0.
+
+	* NEWS: Updates.
+
+	* README: Some updates; include details about the FreeType
+	license of the OpenType code.
+
 Thu Mar 11 17:28:06 2004  Manish Singh  <yosh@gimp.org>
 
 	* pango/pangofc-fontmap.c: Convert PangoStretch to and from FC_WIDTH,
diff --git a/NEWS b/NEWS
index 045c7217..97b7ae38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Overview of changes between 1.3.6 and 1.4.0
+===========================================
+* Use FC_WIDTH when available so that multiple width fonts are
+  selected properly [Manish Singh]
+
 Overview of changes between 1.3.5 and 1.3.6
 ===========================================
 * Improve handling of some Kannada vowels [Kailash C. Chowksey]
diff --git a/README b/README
index 5885b131..3138c268 100644
--- a/README
+++ b/README
@@ -2,16 +2,18 @@ Pango is a library for layout and rendering of text, with an emphasis
 on internationalization. Pango can be used anywhere that text layout
 is needed; however, most of the work on Pango-1.0 was done using the
 GTK+ widget toolkit as a test platform. Pango forms the core of text
-and font handling for GTK+-2.0.
+and font handling for GTK+-2.x.
 
 Pango is designed to be modular; the core Pango layout can be used
-with four different font backends:
+with three different font backends:
 
- - Core X windowing system fonts
  - Client-side fonts on X using the Xft library
  - Direct rendering of scalable fonts using the FreeType library
  - Native fonts on Microsoft backends
 
+(There is also a core-X font backend still present in the code;
+usage of this backend is deprecated)
+
 Dynamically loaded modules then handle text layout for particular
 combinations of script and font backend.
 
@@ -26,10 +28,10 @@ For more information about Pango, see:
 Dependencies
 ============
 
-Pango depends on version 2.0.0 of the GLib library; more information
+Pango depends on version 2.4.0 of the GLib library; more information
 about GLib can be found at http://www.gtk.org/.
 
-The recommended font backend for X in Pango-1.2 is the Xft backend
+The recommended font backend for X in Pango-1.4 is the Xft backend
 which uses version 2 of the Xft library to manage client
 side fonts. Benefits of the Xft backend include, performance,
 support for OpenType fonts, and antialiasing. Version 2 of
@@ -40,8 +42,9 @@ your system. Both of these libraries are available from
 the same place as fontconfig.
 
 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.2;
-Pango-1.2 requires version 2 of Xft, which is present in XFree86-4.3.
+of XFree86 up to 4.2. This version does not work with Pango-1.4;
+Pango-1.4 requires version 2 of Xft, which is present in XFree86-4.3
+and newer.
 
 Both Xft and the optional PangoFT2 backend require the fontconfig
 library (http://www.fontconfig.org) to look up fonts. At least version 
@@ -55,12 +58,6 @@ the fonts.conf file, found at $(sysconfdir)/fonts/fonts.conf
 (usually /etc/fonts/fonts.conf) to point at the fonts
 on your system.
 
-There is also a backend that uses core X protocol fonts. This
-backend only requires the standard libraries from the X window 
-system. You should already have these installed on your system, but 
-it's possible that you'll need to install the development environment 
-for these libraries that your operating system vendor provides.
-
 Installation of Pango on Win32 is possible, but is not documented
 here. See http://www.gimp.org/~tml/win32/downloads.html.
 
@@ -77,10 +74,20 @@ Notes
 License
 =======
 
-Pango is licensed under the terms of the 
-GNU Lesser Public License (LGPL) - see the file
-COPYING for details.
+Most of the code of Pango is licensed under the terms of the 
+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
+pango/opentype/FT-license.txt for full details of the FreeType 
+license.
+
+Note that binary distributions of Pango must include a disclaimer 
+that the software is based in part of the work of the FreeType Team, 
+in the distribution documentation; for instance, by including this 
+README file.
 
 Owen Taylor
 otaylor@redhat.com
-8 August 2002
+16 March 2004
diff --git a/configure.in b/configure.in
index 5136e1b8..f03f5203 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], [3])
-m4_define([pango_micro_version], [6])
+m4_define([pango_minor_version], [4])
+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.
@@ -281,7 +281,7 @@ fi
 #
 # Checks for GLib
 #
-GLIB_REQUIRED_VERSION=2.3.1
+GLIB_REQUIRED_VERSION=2.4.0
 
 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
   AC_MSG_ERROR([
diff --git a/pango/opentype/FT-license.txt b/pango/opentype/FT-license.txt
index 8dae6094..be596b35 100644
--- a/pango/opentype/FT-license.txt
+++ b/pango/opentype/FT-license.txt
@@ -1,9 +1,13 @@
                     The FreeType Project LICENSE
                     ----------------------------
 
-                       Copyright 1996-1999 by
+                            2000-Feb-08
+
+                       Copyright 1996-2002 by
           David Turner, Robert Wilhelm, and Werner Lemberg
 
+                     Minor editings 2001-Mar-01
+
 
 
 Introduction
@@ -24,7 +28,7 @@ Introduction
   and  use of  free  software in  commercial  and freeware  products
   alike.  As a consequence, its main points are that:
 
-    o We don't promise that this software works.  However, we are be
+    o We don't promise that this software works. However, we will be
       interested in any kind of bug reports. (`as is' distribution)
 
     o You can  use this software for whatever you  want, in parts or
@@ -32,13 +36,13 @@ Introduction
 
     o You may not pretend that  you wrote this software.  If you use
       it, or  only parts of it,  in a program,  you must acknowledge
-      somewhere in your documentation  that you've used the FreeType
-      code. (`credits')
+      somewhere  in  your  documentation  that  you  have  used  the
+      FreeType code. (`credits')
 
   We  specifically  permit  and  encourage  the  inclusion  of  this
-  software,  with  or without modifications, in commercial products,
-  provided that all warranty or  liability claims are assumed by the
-  product vendor.
+  software, with  or without modifications,  in commercial products.
+  We  disclaim  all warranties  covering  The  FreeType Project  and
+  assume no liability related to The FreeType Project.
 
 
 Legal Terms
@@ -50,7 +54,7 @@ Legal Terms
   Throughout this license,  the terms `package', `FreeType Project',
   and  `FreeType  archive' refer  to  the  set  of files  originally
   distributed  by the  authors  (David Turner,  Robert Wilhelm,  and
-  Werner Lemberg) as the `FreeType project', be they named as alpha,
+  Werner Lemberg) as the `FreeType Project', be they named as alpha,
   beta or final release.
 
   `You' refers to  the licensee, or person using  the project, where
@@ -60,47 +64,42 @@ Legal Terms
   engine'.
 
   This  license applies  to all  files distributed  in  the original
-  FreeType  archive,   including  all  source   code,  binaries  and
+  FreeType  Project,   including  all  source   code,  binaries  and
   documentation,  unless  otherwise  stated   in  the  file  in  its
   original, unmodified form as  distributed in the original archive.
   If you are  unsure whether or not a particular  file is covered by
   this license, you must contact us to verify this.
 
-  The FreeType  project is copyright (C) 1996-1999  by David Turner,
+  The FreeType  Project is copyright (C) 1996-2002  by David Turner,
   Robert Wilhelm, and Werner Lemberg.  All rights reserved except as
   specified below.
 
 1. No Warranty
 --------------
 
-  THE FREETYPE ARCHIVE  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
-  KIND, EITHER EXPRESSED OR  IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+  THE FREETYPE PROJECT  IS PROVIDED `AS IS' WITHOUT  WARRANTY OF ANY
+  KIND, EITHER  EXPRESS OR IMPLIED,  INCLUDING, BUT NOT  LIMITED TO,
   WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR
   PURPOSE.  IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
   BE LIABLE  FOR ANY DAMAGES CAUSED  BY THE USE OR  THE INABILITY TO
   USE, OF THE FREETYPE PROJECT.
 
-  As  you have  not signed  this license,  you are  not  required to
-  accept  it.   However,  as  the FreeType  project  is  copyrighted
-  material, only  this license, or  another one contracted  with the
-  authors, grants you  the right to use, distribute,  and modify it.
-  Therefore,  by  using,  distributing,  or modifying  the  FreeType
-  project, you indicate that you understand and accept all the terms
-  of this license.
-
 2. Redistribution
 -----------------
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
+  This  license  grants  a  worldwide, royalty-free,  perpetual  and
+  irrevocable right  and license to use,  execute, perform, compile,
+  display,  copy,   create  derivative  works   of,  distribute  and
+  sublicense the  FreeType Project (in  both source and  object code
+  forms)  and  derivative works  thereof  for  any  purpose; and  to
+  authorize others  to exercise  some or all  of the  rights granted
+  herein, subject to the following conditions:
 
     o Redistribution  of source code  must retain this  license file
-      (`licence.txt') unaltered; any additions, deletions or changes
-      to   the  original   files  must   be  clearly   indicated  in
-      accompanying  documentation.   The  copyright notices  of  the
-      unaltered, original  files must be preserved in  all copies of
-      source files.
+      unaltered; any additions, deletions or changes to the original
+      files must be clearly indicated in accompanying documentation.
+      The copyright notices of the unaltered, original files must be
+      preserved in all copies of source files.
 
     o Redistribution in binary form must provide a  disclaimer  that
       states  that  the software is based in part of the work of the
@@ -109,22 +108,30 @@ Legal Terms
       documentation, though this isn't mandatory.
 
   These conditions  apply to any  software derived from or  based on
-  the FreeType code, not just  the unmodified files.  If you use our
-  work, you  must acknowledge us.  However,  no fee need  be paid to
-  us.
+  the FreeType Project,  not just the unmodified files.   If you use
+  our work, you  must acknowledge us.  However, no  fee need be paid
+  to us.
 
 3. Advertising
 --------------
 
-  The names of  FreeType's authors and contributors may  not be used
-  to endorse or promote  products derived from this software without
-  specific prior written permission.
+  Neither the  FreeType authors and  contributors nor you  shall use
+  the name of the  other for commercial, advertising, or promotional
+  purposes without specific prior written permission.
   
   We suggest,  but do not require, that  you use one or  more of the
   following phrases to refer  to this software in your documentation
   or advertising  materials: `FreeType Project',  `FreeType Engine',
   `FreeType library', or `FreeType Distribution'.
 
+  As  you have  not signed  this license,  you are  not  required to
+  accept  it.   However,  as  the FreeType  Project  is  copyrighted
+  material, only  this license, or  another one contracted  with the
+  authors, grants you  the right to use, distribute,  and modify it.
+  Therefore,  by  using,  distributing,  or modifying  the  FreeType
+  Project, you indicate that you understand and accept all the terms
+  of this license.
+
 4. Contacts
 -----------
 
@@ -155,4 +162,4 @@ Legal Terms
     Werner Lemberg    <werner.lemberg@freetype.org>
 
 
---- end of license.txt ---
+--- end of FTL.txt ---