glib: Improve copyright headers.

The copyright headers should be unambiguous even if a single file is copied from
the GNU gettext package and used elsewhere. Reported by John Darrington.

* libtextstyle/gnulib-local/lib/glib*: Add FSF copyright header.

diff --git a/libtextstyle/gnulib-local/lib/glib/ghash.c b/libtextstyle/gnulib-local/lib/glib/ghash.c
index d8fdfd5565f51d268d95ea1b0ee8eb9720da1a47..98ed306a75c22068dfa120adbb54bdb9cbc98544 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/ghash.c
+++ b/libtextstyle/gnulib-local/lib/glib/ghash.c
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/ghash.in.h b/libtextstyle/gnulib-local/lib/glib/ghash.in.h
index 960c7fcd0d56166f96dcfb73302a17ff46c99fe8..398a4a07cbad327b113c45bb9b3a1c5e194aba06 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/ghash.in.h
+++ b/libtextstyle/gnulib-local/lib/glib/ghash.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/glist.c b/libtextstyle/gnulib-local/lib/glib/glist.c
index df478279df3dfee01ea0f679c7b0fa94d6e7e016..7278a974fc2b1bbca161d557dba6853f401c0057 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/glist.c
+++ b/libtextstyle/gnulib-local/lib/glib/glist.c
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/glist.in.h b/libtextstyle/gnulib-local/lib/glib/glist.in.h
index 2f1e627a8de7816caf153a6224565516a8af1dc7..83f3b86f5aaab7b31b227d089a29017e6d7e2b59 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/glist.in.h
+++ b/libtextstyle/gnulib-local/lib/glib/glist.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gmacros.in.h b/libtextstyle/gnulib-local/lib/glib/gmacros.in.h
index 5c2174095dd0870d85bbafa29e448b95293706a8..aac05d34813be648155dc749708e96624ad575eb 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gmacros.in.h
+++ b/libtextstyle/gnulib-local/lib/glib/gmacros.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gmessages.c b/libtextstyle/gnulib-local/lib/glib/gmessages.c
index c35cbb6e5943ae8b7e667b047b33ecc25ccff91b..07ed434ca7234352488bbd24e61bde2fb79f9c79 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gmessages.c
+++ b/libtextstyle/gnulib-local/lib/glib/gmessages.c
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gprimes.c b/libtextstyle/gnulib-local/lib/glib/gprimes.c
index bf4cab435a8bfd3274a9e0ac04cabe0f50937210..1a204f4cc2887473f68d8d4bbc1911e3349b9e5c 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gprimes.c
+++ b/libtextstyle/gnulib-local/lib/glib/gprimes.c
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gprimes.in.h b/libtextstyle/gnulib-local/lib/glib/gprimes.in.h
index 7c04d319d849b3893c56a7145e888c30cee5f905..927628a6e27bc6684804bbf79ac42a43c4fc47c3 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gprimes.in.h
+++ b/libtextstyle/gnulib-local/lib/glib/gprimes.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gprintfint.in.h b/libtextstyle/gnulib-local/lib/glib/gprintfint.in.h
index 6986e404c6ae33daec81932ba23b8b40e32f3f23..b807e7dbabfd62af4e619812fdfd0393c1b7f4c7 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gprintfint.in.h
+++ b/libtextstyle/gnulib-local/lib/glib/gprintfint.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gstrfuncs.c b/libtextstyle/gnulib-local/lib/glib/gstrfuncs.c
index 214d128a74e3144b5a090a9a8d9ea2be4fe96714..6ec6c693230fe536ab7720bcf6fa26ecb504b280 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gstrfuncs.c
+++ b/libtextstyle/gnulib-local/lib/glib/gstrfuncs.c
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gstrfuncs.in.h b/libtextstyle/gnulib-local/lib/glib/gstrfuncs.in.h
index 172e3a193094f55ddd6536638164914a07da5627..15c96a020f041a9e5a3ee3b268700dab8b139ae0 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gstrfuncs.in.h
+++ b/libtextstyle/gnulib-local/lib/glib/gstrfuncs.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gstring.c b/libtextstyle/gnulib-local/lib/glib/gstring.c
index ef67c123fdb345712223d5c1d04931aa1e028d05..f32792957aab97be9b1c550b76d6d91fc80ee0c5 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gstring.c
+++ b/libtextstyle/gnulib-local/lib/glib/gstring.c
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gstring.in.h b/libtextstyle/gnulib-local/lib/glib/gstring.in.h
index d167eaff88b0985bec8fbf0af264312495b1f88a..06ac1fde8aa59fa6f8886301d84e2cda0cf79ab2 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gstring.in.h
+++ b/libtextstyle/gnulib-local/lib/glib/gstring.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glib/gtypes.in.h b/libtextstyle/gnulib-local/lib/glib/gtypes.in.h
index 404502738ce78c97904b31ad5f3c5f7911d40a04..f0ef65158fa04a35453e4a6344fbe74372880f48 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glib/gtypes.in.h
+++ b/libtextstyle/gnulib-local/lib/glib/gtypes.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *

diff --git a/libtextstyle/gnulib-local/lib/glibconfig.in.h b/libtextstyle/gnulib-local/lib/glibconfig.in.h
index 9a73ea20d83594a266daf16997cbe312c36f5a5d..e78977002f2ac30ef0f64b800ef33f9103806715 100644 (file)
--- a/libtextstyle/gnulib-local/lib/glibconfig.in.h
+++ b/libtextstyle/gnulib-local/lib/glibconfig.in.h
@@ -1,3 +1,12 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ *
+ * This file is not part of the GNU gettext program, but is used with
+ * GNU gettext.
+ *
+ * The original copyright notice is as follows:
+ */
+
 /* GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *