Fix up places where there is missing or incomplete Copyright and License

2005-07-21  Owen Taylor  <otaylor@redhat.com>

        Fix up places where there is missing or incomplete
        Copyright and License information (Reported by William N. Ray)

        * pango/opentype/fterrcompat.h: Mark as FreeType/GPL licensed.

        * pango/opentype/FT-license.txt: Make this the dual-licensing
        description that covers the FreeType code (FreeType's
        LICENSE.TXT) rather than the FTL.

        * pango/opentype/FTL.TXT: Move the FTL (referenced from
        FT-license.txt) to here.

        * modules/basic/basic-common.h modules/hebrew/hebrew-shaper.h
        modules/thai/thai-charprop.c modules/thai/thai-shaper.h
        tools/gen-script-for-lang.c tests/testcolor.c:
        Add LGPL header and copyright information.

        * modules/indic/indic-ot.[ch] modules/indic/indic-ot-class-tables.c
        modules/thai/thai-ot.[ch]: Add LGPL header.

        * modules/thai/thai-shaper.c modules/thai/thai-charprop.h:
        Minor fixes to copyright information.

        * modules/arabic/arabic-ot.c: Add Freetype license boilerplate.

19 files changed, 320 insertions, 166 deletions

diff --git a/ChangeLog b/ChangeLog
index 22276793..3963c32f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2005-07-21  Owen Taylor  <otaylor@redhat.com>
+
+	Fix up places where there is missing or incomplete
+	Copyright and License information (Reported by William N. Ray)
+
+	* pango/opentype/fterrcompat.h: Mark as FreeType/GPL licensed.
+
+	* pango/opentype/FT-license.txt: Make this the dual-licensing
+	description that covers the FreeType code (FreeType's 
+	LICENSE.TXT) rather than the FTL.
+	
+	* pango/opentype/FTL.TXT: Move the FTL (referenced from 
+	FT-license.txt) to here.
+	
+	* modules/basic/basic-common.h modules/hebrew/hebrew-shaper.h
+	modules/thai/thai-charprop.c modules/thai/thai-shaper.h
+	tools/gen-script-for-lang.c tests/testcolor.c: 
+	Add LGPL header and copyright information.
+
+	* modules/indic/indic-ot.[ch] modules/indic/indic-ot-class-tables.c
+	modules/thai/thai-ot.[ch]: Add LGPL header.
+
+	* modules/thai/thai-shaper.c modules/thai/thai-charprop.h: 
+	Minor fixes to copyright information.
+
+	* modules/arabic/arabic-ot.c: Add Freetype license boilerplate.
+
 2005-06-27  Tor Lillqvist  <tml@novell.com>
 
 	* pango/pango.def: Remove pango_script_for_lang. It was never part
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 22276793..3963c32f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,30 @@
+2005-07-21  Owen Taylor  <otaylor@redhat.com>
+
+	Fix up places where there is missing or incomplete
+	Copyright and License information (Reported by William N. Ray)
+
+	* pango/opentype/fterrcompat.h: Mark as FreeType/GPL licensed.
+
+	* pango/opentype/FT-license.txt: Make this the dual-licensing
+	description that covers the FreeType code (FreeType's 
+	LICENSE.TXT) rather than the FTL.
+	
+	* pango/opentype/FTL.TXT: Move the FTL (referenced from 
+	FT-license.txt) to here.
+	
+	* modules/basic/basic-common.h modules/hebrew/hebrew-shaper.h
+	modules/thai/thai-charprop.c modules/thai/thai-shaper.h
+	tools/gen-script-for-lang.c tests/testcolor.c: 
+	Add LGPL header and copyright information.
+
+	* modules/indic/indic-ot.[ch] modules/indic/indic-ot-class-tables.c
+	modules/thai/thai-ot.[ch]: Add LGPL header.
+
+	* modules/thai/thai-shaper.c modules/thai/thai-charprop.h: 
+	Minor fixes to copyright information.
+
+	* modules/arabic/arabic-ot.c: Add Freetype license boilerplate.
+
 2005-06-27  Tor Lillqvist  <tml@novell.com>
 
 	* pango/pango.def: Remove pango_script_for_lang. It was never part
diff --git a/modules/arabic/arabic-ot.c b/modules/arabic/arabic-ot.c
index ef667e68..2501edb7 100644
--- a/modules/arabic/arabic-ot.c
+++ b/modules/arabic/arabic-ot.c
@@ -15,6 +15,14 @@
 /*  `final' properties to an input string of character codes for the Arabic */
 /*  script.                                                                 */
 /*                                                                          */
+/*  This file is part of the FreeType project, and may only be used         */
+/*  modified and distributed under the terms of the FreeType project        */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute      */
+/*  this file you indicate that you have read the license and               */
+/*  understand and accept it fully.                                         */
+/*                                                                          */
+/* The file LICENSE.TXT can be found in the Pango distribution as           */
+/* pango/opentype/FT-license.txt                                            */
 /****************************************************************************/
 
 #include "arabic-ot.h"
diff --git a/modules/arabic/arabic-ot.h b/modules/arabic/arabic-ot.h
index 0be0ccf7..401279be 100644
--- a/modules/arabic/arabic-ot.h
+++ b/modules/arabic/arabic-ot.h
@@ -15,9 +15,16 @@
 /*  `final' properties to an input string of character codes for the Arabic */
 /*  script.                                                                 */
 /*                                                                          */
+/*  This file is part of the FreeType project, and may only be used         */
+/*  modified and distributed under the terms of the FreeType project        */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute      */
+/*  this file you indicate that you have read the license and               */
+/*  understand and accept it fully.                                         */
+/*                                                                          */
+/* The file LICENSE.TXT can be found in the Pango distribution as           */
+/* pango/opentype/FT-license.txt                                            */
 /****************************************************************************/
 
-
 #include <pango/pango-ot.h>
 
 
diff --git a/modules/basic/basic-common.h b/modules/basic/basic-common.h
index 2932e383..b66c2e5f 100644
--- a/modules/basic/basic-common.h
+++ b/modules/basic/basic-common.h
@@ -1,3 +1,24 @@
+/* Pango
+ * basic-fc.c: Basic shaper for FreeType-based backends
+ *
+ * Copyright (C) 2002 Sven Neumann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #ifndef __BASIC_COMMON_H__
 #define __BASIC_COMMON_H__
 
diff --git a/modules/hebrew/hebrew-shaper.h b/modules/hebrew/hebrew-shaper.h
index 6b590013..612de35b 100644
--- a/modules/hebrew/hebrew-shaper.h
+++ b/modules/hebrew/hebrew-shaper.h
@@ -1,3 +1,25 @@
+/* Pango
+ * hebrew-shaper.h: Hebrew shaper internal functions
+ *
+ * Copyright (c) 2001 by Sun Microsystems, Inc.
+ * Author: Chookij Vanatham <Chookij.Vanatham@Eng.Sun.COM>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #ifndef HEBREW_SHAPER_H
 #define HEBREW_SHAPER_H
 
diff --git a/modules/indic/indic-ot-class-tables.c b/modules/indic/indic-ot-class-tables.c
index 650a0059..b8aa4940 100644
--- a/modules/indic/indic-ot-class-tables.c
+++ b/modules/indic/indic-ot-class-tables.c
@@ -1,9 +1,23 @@
 /* Pango
  * indic-ot-class-tables.c:
  *
- * Copyright (C) 2001, 2002 IBM Corporation. All Rights Reserved.
+ * Copyright (C) 2001, 2002 IBM Corporation
  * Author: Eric Mader <mader@jtcsv.com>
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "indic-ot.h"
diff --git a/modules/indic/indic-ot.c b/modules/indic/indic-ot.c
index 6b484f3b..2016a1ab 100644
--- a/modules/indic/indic-ot.c
+++ b/modules/indic/indic-ot.c
@@ -1,9 +1,23 @@
 /* Pango
  * indic-ot.c:
  *
- * Copyright (C) 2001, 2002 IBM Corporation. All Rights Reserved.
+ * Copyright (C) 2001, 2002 IBM Corporation.
  * Author: Eric Mader <mader@jtcsv.com>
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "indic-ot.h"
diff --git a/modules/indic/indic-ot.h b/modules/indic/indic-ot.h
index d4c37a8b..bb49a4e2 100644
--- a/modules/indic/indic-ot.h
+++ b/modules/indic/indic-ot.h
@@ -1,9 +1,23 @@
 /* Pango
  * indic-ot.h:
  *
- * Copyright (C) 2001, 2002 IBM Corporation. All Rights Reserved.
+ * Copyright (C) 2001, 2002 IBM Corporation.
  * Author: Eric Mader <mader@jtcsv.com>
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __INDIC_OT_H__
diff --git a/modules/thai/thai-charprop.c b/modules/thai/thai-charprop.c
index a9f7a056..b657f1eb 100644
--- a/modules/thai/thai-charprop.c
+++ b/modules/thai/thai-charprop.c
@@ -1,3 +1,29 @@
+/* Pango
+ * thai-charprop.c: character property tables
+ *
+ * Copyright (C) 2004 Theppitak Karoonboonyanan
+ * Copyright (C) 2002 Software and Language Engineering Laboratory, NECTEC
+ * Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
+ *
+ * Copyright (c) 1996-2000 by Sun Microsystems, Inc.
+ * Author: Chookij Vanatham <Chookij.Vanatham@Eng.Sun.COM>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #include "thai-charprop.h"
 
 const gshort thai_char_type[256] = {
diff --git a/modules/thai/thai-charprop.h b/modules/thai/thai-charprop.h
index 38aec4c2..98a8f8d2 100644
--- a/modules/thai/thai-charprop.h
+++ b/modules/thai/thai-charprop.h
@@ -4,8 +4,9 @@
  * Copyright (C) 1999 Red Hat Software
  * Author: Owen Taylor <otaylor@redhat.com>
  *
- * Software and Language Engineering Laboratory, NECTEC
- * Author: Theppitak Karoonboonyanan <thep@links.nectec.or.th>
+ * Copyright (C) 2004 Theppitak Karoonboonyanan
+ * Copyright (C) 2002 Software and Language Engineering Laboratory, NECTEC
+ * Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
  *
  * Copyright (c) 1996-2000 by Sun Microsystems, Inc.
  * Author: Chookij Vanatham <Chookij.Vanatham@Eng.Sun.COM>
diff --git a/modules/thai/thai-ot.c b/modules/thai/thai-ot.c
index 15956c4d..7ece31e0 100644
--- a/modules/thai/thai-ot.c
+++ b/modules/thai/thai-ot.c
@@ -3,6 +3,21 @@
  *
  * Copyright (C) 2004 Theppitak Karoonboonyanan
  * Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include <string.h>
diff --git a/modules/thai/thai-ot.h b/modules/thai/thai-ot.h
index 4e195e8c..35252a7a 100644
--- a/modules/thai/thai-ot.h
+++ b/modules/thai/thai-ot.h
@@ -3,6 +3,21 @@
  *
  * Copyright (C) 2004 Theppitak Karoonboonyanan
  * Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __THAI_OT_H__
diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c
index c426ee8d..a4c21bfb 100644
--- a/modules/thai/thai-shaper.c
+++ b/modules/thai/thai-shaper.c
@@ -4,7 +4,8 @@
  * Copyright (C) 1999 Red Hat Software
  * Author: Owen Taylor <otaylor@redhat.com>
  *
- * Software and Language Engineering Laboratory, NECTEC
+ * Copyright (C) 2005 Theppitak Karoonboonyanan
+ * Copyright (C) 2002 Software and Language Engineering Laboratory, NECTEC
  * Author: Theppitak Karoonboonyanan <thep@links.nectec.or.th>
  *
  * Copyright (c) 1996-2000 by Sun Microsystems, Inc.
diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h
index 09b8faef..94322ab0 100644
--- a/modules/thai/thai-shaper.h
+++ b/modules/thai/thai-shaper.h
@@ -1,3 +1,32 @@
+/* Pango
+ * thai-shaper.h:
+ *
+ * Copyright (C) 1999 Red Hat Software
+ * Author: Owen Taylor <otaylor@redhat.com>
+ *
+ * Copyright (C) 2004 Theppitak Karoonboonyanan
+ * Copyright (C) 2002 Software and Language Engineering Laboratory, NECTEC
+ * Author: Theppitak Karoonboonyanan <thep@linux.thai.net>
+ *
+ * Copyright (c) 1996-2000 by Sun Microsystems, Inc.
+ * Author: Chookij Vanatham <Chookij.Vanatham@Eng.Sun.COM>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #ifndef __THAI_SHAPER_H__
 #define __THAI_SHAPER_H__
 
diff --git a/pango/opentype/FT-license.txt b/pango/opentype/FT-license.txt
index be596b35..102a03d6 100644
--- a/pango/opentype/FT-license.txt
+++ b/pango/opentype/FT-license.txt
@@ -1,165 +1,28 @@
-                    The FreeType Project LICENSE
-                    ----------------------------
 
-                            2000-Feb-08
+The  FreeType 2  font  engine is  copyrighted  work and  cannot be  used
+legally  without a  software license.   In  order to  make this  project
+usable  to a vast  majority of  developers, we  distribute it  under two
+mutually exclusive open-source licenses.
 
-                       Copyright 1996-2002 by
-          David Turner, Robert Wilhelm, and Werner Lemberg
+This means  that *you* must choose  *one* of the  two licenses described
+below, then obey  all its terms and conditions when  using FreeType 2 in
+any of your projects or products.
 
-                     Minor editings 2001-Mar-01
+  - The FreeType License, found in  the file `FTL.TXT', which is similar
+    to the original BSD license *with* an advertising clause that forces
+    you  to  explicitly cite  the  FreeType  project  in your  product's
+    documentation.  All  details are in the license  file.  This license
+    is  suited  to products  which  don't  use  the GNU  General  Public
+    License.
 
+  - The GNU  General Public License  version 2, found in  `GPL.TXT' (any
+    later version can be used  also), for programs which already use the
+    GPL.  Note  that the  FTL is  incompatible with the  GPL due  to its
+    advertisement clause.
 
+The contributed PCF driver comes with a license similar to that of the X
+Window System.   It is  compatible to the  above two licenses  (see file
+src/pcf/readme).
 
-Introduction
-============
 
-  The FreeType  Project is distributed in  several archive packages;
-  some of them may contain, in addition to the FreeType font engine,
-  various tools and  contributions which rely on, or  relate to, the
-  FreeType Project.
-
-  This  license applies  to all  files found  in such  packages, and
-  which do not  fall under their own explicit  license.  The license
-  affects  thus  the  FreeType   font  engine,  the  test  programs,
-  documentation and makefiles, at the very least.
-
-  This  license   was  inspired  by  the  BSD,   Artistic,  and  IJG
-  (Independent JPEG  Group) licenses, which  all encourage inclusion
-  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 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
-      full form, without having to pay us. (`royalty-free' usage)
-
-    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  have  used  the
-      FreeType code. (`credits')
-
-  We  specifically  permit  and  encourage  the  inclusion  of  this
-  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
-===========
-
-0. Definitions
---------------
-
-  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,
-  beta or final release.
-
-  `You' refers to  the licensee, or person using  the project, where
-  `using' is a generic term including compiling the project's source
-  code as  well as linking it  to form a  `program' or `executable'.
-  This  program is  referred to  as  `a program  using the  FreeType
-  engine'.
-
-  This  license applies  to all  files distributed  in  the original
-  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-2002  by David Turner,
-  Robert Wilhelm, and Werner Lemberg.  All rights reserved except as
-  specified below.
-
-1. No Warranty
---------------
-
-  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.
-
-2. Redistribution
------------------
-
-  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
-      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
-      FreeType Team,  in  the  distribution  documentation.  We also
-      encourage you to put an URL to the FreeType web page  in  your
-      documentation, though this isn't mandatory.
-
-  These conditions  apply to any  software derived from or  based on
-  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
---------------
-
-  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
------------
-
-  There are two mailing lists related to FreeType:
-
-    o freetype@freetype.org
-
-      Discusses general use and applications of FreeType, as well as
-      future and  wanted additions to the  library and distribution.
-      If  you are looking  for support,  start in  this list  if you
-      haven't found anything to help you in the documentation.
-
-    o devel@freetype.org
-
-      Discusses bugs,  as well  as engine internals,  design issues,
-      specific licenses, porting, etc.
-
-    o http://www.freetype.org
-
-      Holds the current  FreeType web page, which will  allow you to
-      download  our  latest  development  version  and  read  online
-      documentation.
-
-  You can also contact us individually at:
-
-    David Turner      <david.turner@freetype.org>
-    Robert Wilhelm    <robert.wilhelm@freetype.org>
-    Werner Lemberg    <werner.lemberg@freetype.org>
-
-
---- end of FTL.txt ---
+--- end of LICENSE.TXT ---
diff --git a/pango/opentype/fterrcompat.h b/pango/opentype/fterrcompat.h
index 27b99751..2c4d2caf 100644
--- a/pango/opentype/fterrcompat.h
+++ b/pango/opentype/fterrcompat.h
@@ -1,4 +1,12 @@
-
+/* Pango
+ * fterrcompat.h: Compat defines for compiling with newer versions
+ *                of FreeType
+ *
+ * Copyright © 2003 Red Hat, Inc
+ *
+ * The code is dual-licensed under the GNU Public License and the
+ * FreeType license. See see FT-license.txt for full details.
+ */
 #ifndef FTERRCOMPAT_H
 #define FTERRCOMPAT_H
 
diff --git a/tests/testcolor.c b/tests/testcolor.c
index e41b053e..fe23d72d 100644
--- a/tests/testcolor.c
+++ b/tests/testcolor.c
@@ -1,3 +1,24 @@
+/* Pango
+ * test-color.c: Test program for pango_color_parse()
+ *
+ * Copyright © 2002 Matthias Clasen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #include <glib.h>
 #include <pango/pango.h>
 
diff --git a/tools/gen-script-for-lang.c b/tools/gen-script-for-lang.c
index 9b243e31..e51294ff 100644
--- a/tools/gen-script-for-lang.c
+++ b/tools/gen-script-for-lang.c
@@ -1,3 +1,24 @@
+/* Pango
+ * gen-script-for-lang.c: Utility program to generate pango-script-lang-table.h
+ *
+ * Copyright © 2003 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>