Clarify the copyright of the programs.

Put gettext.sh under LGPL.

diff --git a/gettext-runtime/COPYING b/gettext-runtime/COPYING
index 5e6eb1a3700f85ef41855eb74dfabb5728607852..0a12452aadc82cbf6268cfdcc772e9844f7114ef 100644 (file)
--- a/gettext-runtime/COPYING
+++ b/gettext-runtime/COPYING
@@ -1,2 +1,14 @@
-The gettext-runtime package is under the LGPL, see files intl/COPYING.LIB-2.0
-and intl/COPYING.LIB-2.1.
+The gettext-runtime package is partially under the LGPL and partially under
+the GPL.
+
+The following parts are under the LGPL, see files intl/COPYING.LIB-2.0 and
+intl/COPYING.LIB-2.1:
+  - the libintl and libasprintf libraries and their header files,
+  - the libintl.jar Java library,
+  - the GNU.Gettext.dll C# library,
+  - the gettext.sh shells script function library.
+
+The following parts are under the GPL, see file COPYING in the toplevel
+directory:
+  - the _programs_ gettext, ngettext, envsubst,
+  - the documentation.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 08875a946284371bf683f76a41317d113ae4b2fc..7e7a540b003b78afb36332ef4886479c238e7c6b 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-14  Bruno Haible  <bruno@clisp.org>
+
+       * COPYING: Clarify copyright of the programs.
+       Reported by Charles Wilson <cwilson@fastmail.fm>.
+
 2006-10-02  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (EXTRA_DIST): Add gnulib-m4/gnulib-cache.m4.

diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 19e88f7f746065c54fd28aba8d6305e7d11a05a3..56b7fcdc8ed621086c67a3eaf0ada5a0dcfb32c2 100644 (file)
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-14  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.sh.in: Put under LGPL.
+
 2006-07-31  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (AM_CPPFLAGS, LDADD, RELOCATABLE_SRC_DIR,

diff --git a/gettext-runtime/src/gettext.sh.in b/gettext-runtime/src/gettext.sh.in
index 2519ada1842a7d41177899a74b17503d0fed4787..4a90e3f673597812a5e1ae973da9a9af24c611ce 100644 (file)
--- a/gettext-runtime/src/gettext.sh.in
+++ b/gettext-runtime/src/gettext.sh.in
@@ -1,10 +1,10 @@
 #! /bin/sh
 #
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# This program 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, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,9 +12,10 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 #
 
 # Find a way to echo strings without interpreting backslash.