* elf/ldconfig.c: Allow GPLv2 or any later version.

	* elf/readlib.c: Likewise.
	* elf/chroot_canon.c: Likewise.
	* elf/cache.c: Likewise.
	* nscd/mem.c: Likewise.
	* nscd/getpwuid_r.c: Likewise.
	* nscd/grpcache.c: Likewise.
	* nscd/aicache.c: Likewise.
	* nscd/getsrvbynm_r.c: Likewise.
	* nscd/nscd.c: Likewise.
	* nscd/servicescache.c: Likewise.
	* nscd/getsrvbypt_r.c: Likewise.
	* nscd/initgrcache.c: Likewise.
	* nscd/gethstbyad_r.c: Likewise.
	* nscd/gethstbynm2_r.c: Likewise.
	* nscd/getgrnam_r.c: Likewise.
	* nscd/nscd_setup_thread.c: Likewise.
	* nscd/getpwnam_r.c: Likewise.
	* nscd/gai.c: Likewise.
	* nscd/connections.c: Likewise.
	* nscd/dbg_log.c: Likewise.
	* nscd/cache.c: Likewise.
	* nscd/hstcache.c: Likewise.
	* nscd/nscd_conf.c: Likewise.
	* nscd/getgrgid_r.c: Likewise.
	* nscd/pwdcache.c: Likewise.
	* catgets/gencat.c: Likewise.
	* locale/programs/linereader.h: Likewise.
	* locale/programs/locarchive.c: Likewise.
	* locale/programs/ld-paper.c: Likewise.
	* locale/programs/locfile-kw.h: Likewise.
	* locale/programs/ld-address.c: Likewise.
	* locale/programs/xmalloc.c: Likewise.
	* locale/programs/ld-time.c: Likewise.
	* locale/programs/localedef.c: Likewise.
	* locale/programs/simple-hash.c: Likewise.
	* locale/programs/xstrdup.c: Likewise.
	* locale/programs/ld-numeric.c: Likewise.
	* locale/programs/locfile-kw.gperf: Likewise.
	* locale/programs/ld-collate.c: Likewise.
	* locale/programs/charmap-kw.gperf: Likewise.
	* locale/programs/charmap.h: Likewise.
	* locale/programs/charmap-kw.h: Likewise.
	* locale/programs/config.h: Likewise.
	* locale/programs/locfile.c: Likewise.
	* locale/programs/ld-ctype.c: Likewise.
	* locale/programs/charmap.c: Likewise.
	* locale/programs/ld-messages.c: Likewise.
	* locale/programs/repertoire.h: Likewise.
	* locale/programs/locale.c: Likewise.
	* locale/programs/ld-name.c: Likewise.
	* locale/programs/linereader.c: Likewise.
	* locale/programs/locfile.h: Likewise.
	* locale/programs/3level.h: Likewise.
	* locale/programs/ld-monetary.c: Likewise.
	* locale/programs/ld-measurement.c: Likewise.
	* locale/programs/charmap-dir.c: Likewise.
	* locale/programs/ld-identification.c: Likewise.
	* locale/programs/localedef.h: Likewise.
	* locale/programs/charmap-dir.h: Likewise.
	* locale/programs/repertoire.c: Likewise.
	* locale/programs/simple-hash.h: Likewise.
	* locale/programs/ld-telephone.c: Likewise.
	* locale/programs/locale-spec.c: Likewise.
	* locale/programs/locfile-token.h: Likewise.
	* posix/getconf.c: Likewise.
	* iconv/dummy-repertoire.c: Likewise.
	* iconv/iconv_charmap.c: Likewise.
	* iconv/iconvconfig.c: Likewise.
	* iconv/iconv_prog.c: Likewise.
	* malloc/memusagestat.c: Likewise.
	* sysdeps/unix/sysv/linux/nscd_setup_thread.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index f9c5682a61f14a321dbc186c2d42da2d9b95ada9..cf2945e3815d8e074c42e55c63f5179775f7cb42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+2007-07-14  Jakub Jelinek  <jakub@redhat.com>
+
+       * elf/ldconfig.c: Allow GPLv2 or any later version.
+       * elf/readlib.c: Likewise.
+       * elf/chroot_canon.c: Likewise.
+       * elf/cache.c: Likewise.
+       * nscd/mem.c: Likewise.
+       * nscd/getpwuid_r.c: Likewise.
+       * nscd/grpcache.c: Likewise.
+       * nscd/aicache.c: Likewise.
+       * nscd/getsrvbynm_r.c: Likewise.
+       * nscd/nscd.c: Likewise.
+       * nscd/servicescache.c: Likewise.
+       * nscd/getsrvbypt_r.c: Likewise.
+       * nscd/initgrcache.c: Likewise.
+       * nscd/gethstbyad_r.c: Likewise.
+       * nscd/gethstbynm2_r.c: Likewise.
+       * nscd/getgrnam_r.c: Likewise.
+       * nscd/nscd_setup_thread.c: Likewise.
+       * nscd/getpwnam_r.c: Likewise.
+       * nscd/gai.c: Likewise.
+       * nscd/connections.c: Likewise.
+       * nscd/dbg_log.c: Likewise.
+       * nscd/cache.c: Likewise.
+       * nscd/hstcache.c: Likewise.
+       * nscd/nscd_conf.c: Likewise.
+       * nscd/getgrgid_r.c: Likewise.
+       * nscd/pwdcache.c: Likewise.
+       * catgets/gencat.c: Likewise.
+       * locale/programs/linereader.h: Likewise.
+       * locale/programs/locarchive.c: Likewise.
+       * locale/programs/ld-paper.c: Likewise.
+       * locale/programs/locfile-kw.h: Likewise.
+       * locale/programs/ld-address.c: Likewise.
+       * locale/programs/xmalloc.c: Likewise.
+       * locale/programs/ld-time.c: Likewise.
+       * locale/programs/localedef.c: Likewise.
+       * locale/programs/simple-hash.c: Likewise.
+       * locale/programs/xstrdup.c: Likewise.
+       * locale/programs/ld-numeric.c: Likewise.
+       * locale/programs/locfile-kw.gperf: Likewise.
+       * locale/programs/ld-collate.c: Likewise.
+       * locale/programs/charmap-kw.gperf: Likewise.
+       * locale/programs/charmap.h: Likewise.
+       * locale/programs/charmap-kw.h: Likewise.
+       * locale/programs/config.h: Likewise.
+       * locale/programs/locfile.c: Likewise.
+       * locale/programs/ld-ctype.c: Likewise.
+       * locale/programs/charmap.c: Likewise.
+       * locale/programs/ld-messages.c: Likewise.
+       * locale/programs/repertoire.h: Likewise.
+       * locale/programs/locale.c: Likewise.
+       * locale/programs/ld-name.c: Likewise.
+       * locale/programs/linereader.c: Likewise.
+       * locale/programs/locfile.h: Likewise.
+       * locale/programs/3level.h: Likewise.
+       * locale/programs/ld-monetary.c: Likewise.
+       * locale/programs/ld-measurement.c: Likewise.
+       * locale/programs/charmap-dir.c: Likewise.
+       * locale/programs/ld-identification.c: Likewise.
+       * locale/programs/localedef.h: Likewise.
+       * locale/programs/charmap-dir.h: Likewise.
+       * locale/programs/repertoire.c: Likewise.
+       * locale/programs/simple-hash.h: Likewise.
+       * locale/programs/ld-telephone.c: Likewise.
+       * locale/programs/locale-spec.c: Likewise.
+       * locale/programs/locfile-token.h: Likewise.
+       * posix/getconf.c: Likewise.
+       * iconv/dummy-repertoire.c: Likewise.
+       * iconv/iconv_charmap.c: Likewise.
+       * iconv/iconvconfig.c: Likewise.
+       * iconv/iconv_prog.c: Likewise.
+       * malloc/memusagestat.c: Likewise.
+       * sysdeps/unix/sysv/linux/nscd_setup_thread.c: Likewise.
+
 2007-07-06  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
        * sysdeps/sh/bsd-setjmp.S (setjmp): Use correct argument registers.

diff --git a/catgets/gencat.c b/catgets/gencat.c
index f5cbb8e1b3e50dc7bb542ba9aece3ef08c297135..d8ce7af72d50158cf7052aaa686f9aa72a51c547 100644 (file)
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/elf/cache.c b/elf/cache.c
index e18446644e5f2ad5c2d7ebcd334a896b1f0561d6..6dbd5a6c08c3bb90d5e39fc92b78eda28d434eb6 100644 (file)
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -3,8 +3,9 @@
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/elf/chroot_canon.c b/elf/chroot_canon.c
index 3ef2fdf08fdc57fce827fa62775f70891230e350..3c16a43ebb5a52cefd61cc6d2f4420a62c95e378 100644 (file)
--- a/elf/chroot_canon.c
+++ b/elf/chroot_canon.c
@@ -4,8 +4,9 @@
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 44ccc1a3d4b9dfc94ac2fdd8bebe8047a5b4d396..accc9f95d5f7e88915dc3c2d69992a097c05942e 100644 (file)
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -3,8 +3,9 @@
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/elf/readlib.c b/elf/readlib.c
index 8896bbdaca70720c44a15e64e904e8c871f1c33a..a3278d935e15deba7d1b9731917312944615ab61 100644 (file)
--- a/elf/readlib.c
+++ b/elf/readlib.c
@@ -4,8 +4,9 @@
                  Jakub Jelinek <jakub@redhat.com>, 1999.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/iconv/dummy-repertoire.c b/iconv/dummy-repertoire.c
index a87685c505668dd165ab89aee416d2a8bf58da42..cae384c28753400dc0149b1781f66a2d8cddabce 100644 (file)
--- a/iconv/dummy-repertoire.c
+++ b/iconv/dummy-repertoire.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/iconv/iconv_charmap.c b/iconv/iconv_charmap.c
index a54d7381202a479dd3bbbcfaa087c2c37571a02d..f679c64eb2764c0bb206ba037f2f94c4eba95758 100644 (file)
--- a/iconv/iconv_charmap.c
+++ b/iconv/iconv_charmap.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 84493af68ff2386c0ffa54ff1b3d3a86fdad5b0c..24f6a51f1798f492147beebcb1c860c899e4a280 100644 (file)
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 405ee98a913b5b498b5e8c9fe33ccded33a082ac..de3986488cb6dddf90d333961a0b86e79caecdb5 100644 (file)
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/3level.h b/locale/programs/3level.h
index 6f2be0612c778b10157b07d826629b9310e143bf..cce925e1bc405e27e758ccaa6cec3fe6a40b22cc 100644 (file)
--- a/locale/programs/3level.h
+++ b/locale/programs/3level.h
@@ -3,8 +3,9 @@
    Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c
index 07d0cdcfd0616a69c641717793d01005ca9166a6..e192eddde3d95cab48876f95ceeb858e12c4a655 100644 (file)
--- a/locale/programs/charmap-dir.c
+++ b/locale/programs/charmap-dir.c
@@ -2,8 +2,9 @@
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/charmap-dir.h b/locale/programs/charmap-dir.h
index 256db8dc35dee4d841aa57b20d3d68faaf7e010b..028f926b0a7cc23a7294b335903660807aea05fe 100644 (file)
--- a/locale/programs/charmap-dir.h
+++ b/locale/programs/charmap-dir.h
@@ -2,8 +2,9 @@
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/charmap-kw.gperf b/locale/programs/charmap-kw.gperf
index 64f74525009dbd118f07a732d2cf0309fa8e2f47..03fea94844f3cecb7777308bbdc77c87fcbf5fbd 100644 (file)
--- a/locale/programs/charmap-kw.gperf
+++ b/locale/programs/charmap-kw.gperf
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper, <drepper@gnu.org>.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/charmap-kw.h b/locale/programs/charmap-kw.h
index d7d85774da925184b1ded59a864d1b084b9fc5a0..8ad6421639f0efde2cd48e5b6af2cf4ee1647731 100644 (file)
--- a/locale/programs/charmap-kw.h
+++ b/locale/programs/charmap-kw.h
@@ -35,8 +35,9 @@
    Contributed by Ulrich Drepper, <drepper@gnu.org>.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index dbc1101fd07fb4ed175ba5bb8bb7c426c053f7a5..ef528217fd16bfe94bfa427d7840450ba62737b2 100644 (file)
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h
index fd711f2d117101bb999fe45405c88de6aa742ba9..11fddd760a1553f6e9891a426333fa4ed6393339 100644 (file)
--- a/locale/programs/charmap.h
+++ b/locale/programs/charmap.h
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/config.h b/locale/programs/config.h
index 6f9bfde9038706122d0999ac9226cfd98370bc72..2f66997abebfcff65439b72dda668464dbac4b32 100644 (file)
--- a/locale/programs/config.h
+++ b/locale/programs/config.h
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c
index dac85510713f8651afe4644772f36c499d85a3de..6343b3c8a4319a3319b573f1a693b72d6c9f22e4 100644 (file)
--- a/locale/programs/ld-address.c
+++ b/locale/programs/ld-address.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 56f3180b10a5631cf8f6fc742de657efdb2edfc9..591a91806289e4f410b3244d8c4c4e1f32994f50 100644 (file)
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 0e4b96d12feefea9609b26975842077b8a2d937f..891c1100027acfbeb188dd21db55b2225c5a9497 100644 (file)
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c
index d050f7aaa90bf53578119b116f1337b220f7e22d..ae6a6068883dcacfc8b94964a1a2948dcd0e82d9 100644 (file)
--- a/locale/programs/ld-identification.c
+++ b/locale/programs/ld-identification.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-measurement.c b/locale/programs/ld-measurement.c
index 6a9b847a1a3cb08163629f009026e4f8af02d026..8abe38e135ccff0b989274fa0d77ebdf2dc8092c 100644 (file)
--- a/locale/programs/ld-measurement.c
+++ b/locale/programs/ld-measurement.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-messages.c b/locale/programs/ld-messages.c
index e98574f1306f4eb76de93c7eebdfda964c9f1aa0..7e41a19e3975ad365bdc1a04023e4c34f3a84c91 100644 (file)
--- a/locale/programs/ld-messages.c
+++ b/locale/programs/ld-messages.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c
index d493a142b568f1b8ebad9ea236fff692936cfc67..e2634bc2c9503d34cf4c66d65fc57e4bd8ac062c 100644 (file)
--- a/locale/programs/ld-monetary.c
+++ b/locale/programs/ld-monetary.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-name.c b/locale/programs/ld-name.c
index c1153fd51d0403c2013ea42e6844b38a80b9f1f1..9f328828cf24fcaf70c20d3a016f09ba9eb44f79 100644 (file)
--- a/locale/programs/ld-name.c
+++ b/locale/programs/ld-name.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c
index d7ffe75beef5fee95596fea7a47c09ad9f749cec..b1a89e262b027b8212fc70de7680d9aa5d129da6 100644 (file)
--- a/locale/programs/ld-numeric.c
+++ b/locale/programs/ld-numeric.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c
index 38f9af3e60e682619b226ebfbf3937658efe90eb..eda94f63049e98486c688a48f80da321506922b4 100644 (file)
--- a/locale/programs/ld-paper.c
+++ b/locale/programs/ld-paper.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-telephone.c b/locale/programs/ld-telephone.c
index 4075a14f46866bc8b6b137d97ef94b9a7ed79a29..108bdc79a965fba9108c87af759261a7a7231b0e 100644 (file)
--- a/locale/programs/ld-telephone.c
+++ b/locale/programs/ld-telephone.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 0d193503718edcc930ea27da7759badb6fcce0d5..30c13533c298b1126865b2601e2cdd219fa4d3b5 100644 (file)
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
index 4b38fd283c299beb3df2225e7a312960988e3cef..8a04e322769116c2f2165b7ac428323a09d1e6c0 100644 (file)
--- a/locale/programs/linereader.c
+++ b/locale/programs/linereader.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/linereader.h b/locale/programs/linereader.h
index d4d7e830a6ec831c7071011d809ba336c24f1602..e0c844e5b2c06ad85ecfdcb0e09f342e30a1f136 100644 (file)
--- a/locale/programs/linereader.h
+++ b/locale/programs/linereader.h
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper, <drepper@gnu.org>.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/locale-spec.c b/locale/programs/locale-spec.c
index 6ad3d95efed36e5029ad407dab4f7ebd7d2fe364..6334f4c5ff5fe372dba80b8d0b12a987e3ba81d5 100644 (file)
--- a/locale/programs/locale-spec.c
+++ b/locale/programs/locale-spec.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index cc3082d48a76e6edbd9542443058397d93e770f0..8322fc0d75b841e0a04757d126557f5271dad04f 100644 (file)
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 04dcf8ee0d6f842c04f46be5ab0c9dc90dcd0037..3e4d114fdc6ca67dca438ed49e1745ffa3dc5ea2 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/localedef.h b/locale/programs/localedef.h
index f8cc4ca9c1f0d9050ca76b7f671308cae4561d35..bdff9e6f28735396aa43b33b0729d83aa04a0692 100644 (file)
--- a/locale/programs/localedef.h
+++ b/locale/programs/localedef.h
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 91ea8e24c73958d293922421f8d9a7ef0278487e..42e661846e13c9dd7d070850831b7114d3ef351a 100644 (file)
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf
index efdb9afab988f2eee75c6425cc07d79c7def6c4f..936256ab3486b41c6d7210e4d621e4246ac08e96 100644 (file)
--- a/locale/programs/locfile-kw.gperf
+++ b/locale/programs/locfile-kw.gperf
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h
index 6ec2134cdd0fe9cb3e3933366e8b05081d75d453..c883842b3cad8b7f787ee6ba152969c47a7886c5 100644 (file)
--- a/locale/programs/locfile-kw.h
+++ b/locale/programs/locfile-kw.h
@@ -35,8 +35,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h
index beb979c6329f60b62bf5cf4fb9924411bf633988..d6db1a778c018888272c74f7003a5fd9da0719f3 100644 (file)
--- a/locale/programs/locfile-token.h
+++ b/locale/programs/locfile-token.h
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index ae8ce73ce48f2a67744c0bbca94718c4cc3ca905..17cd0209a41e404a79cda9a7a8965b8da6d61a9d 100644 (file)
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h
index f6290f0ee0eba4e6eebe994a9d87cb9c230d66a2..6e5341f36eedf8c7a054d497f8b81d0f2a142c99 100644 (file)
--- a/locale/programs/locfile.h
+++ b/locale/programs/locfile.h
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c
index b6c0a6ad58ba52d4181734f5322ab91fc6e592db..03eed4acf5fc4d099aedd748f8f2c389ae5f8828 100644 (file)
--- a/locale/programs/repertoire.c
+++ b/locale/programs/repertoire.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/repertoire.h b/locale/programs/repertoire.h
index 75877044ca441405808203ce0ee7b54b3e465870..2e1f7ae1926d592e5b23cb0ba18d700b780d3383 100644 (file)
--- a/locale/programs/repertoire.h
+++ b/locale/programs/repertoire.h
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c
index de8998cc7a607e017ff5e49aabff3bf617fafe2a..5bd65f247834ba66993ec173d5db0efe94077fd3 100644 (file)
--- a/locale/programs/simple-hash.c
+++ b/locale/programs/simple-hash.c
@@ -4,8 +4,9 @@
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, October 1994.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/simple-hash.h b/locale/programs/simple-hash.h
index 7261ebc396cbe171ef0d712d0ae260e1dca18e9c..b41c233b064f1bc053c1910983fc2c7b7a74c0b9 100644 (file)
--- a/locale/programs/simple-hash.h
+++ b/locale/programs/simple-hash.h
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/xmalloc.c b/locale/programs/xmalloc.c
index a95dc5a40f300b6b6f0144d75779d1b737337196..a2eeda79b88afee480519d1d2202c6d641def789 100644 (file)
--- a/locale/programs/xmalloc.c
+++ b/locale/programs/xmalloc.c
@@ -4,8 +4,9 @@
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/locale/programs/xstrdup.c b/locale/programs/xstrdup.c
index 12fb3a8287f8537b3984178787c0cf592e31abc0..e6e302f41291f8008c25652ff8bf86463fb39c0c 100644 (file)
--- a/locale/programs/xstrdup.c
+++ b/locale/programs/xstrdup.c
@@ -3,8 +3,9 @@
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c
index 93ac2cd744232c5f018eb9546c6571dc1a12f5ec..779d5c0a59b0d1944ff8db44b78d0f9f3f8d119a 100644 (file)
--- a/malloc/memusagestat.c
+++ b/malloc/memusagestat.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/aicache.c b/nscd/aicache.c
index bccac3abbc7f9bfaaecf4dc6155b17c85595476c..0dc892bc741c070a8add52fc0b3b3b31d2e61e62 100644 (file)
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/cache.c b/nscd/cache.c
index 73e7902cad176a1ecb6293a5fb9537b2621b9e24..56198f6b6ebd12746e486dbd4cf33f04e2dc61d7 100644 (file)
--- a/nscd/cache.c
+++ b/nscd/cache.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/connections.c b/nscd/connections.c
index 1328dc055e8befe853904364a88a93eb2f02a020..48e91e80fec10ef17155ea6665812683ba69da60 100644 (file)
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/dbg_log.c b/nscd/dbg_log.c
index d64afc7e8dec0c051b02932619a5b0da7eef1fd9..5e192c97dd8c093b83d7e19169ded19c134977c1 100644 (file)
--- a/nscd/dbg_log.c
+++ b/nscd/dbg_log.c
@@ -3,8 +3,9 @@
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/gai.c b/nscd/gai.c
index 1233590407163b2ac5d6611e476354952d035c1f..23964b7fd7b57a6e45aec0f44357111c9e98fb7a 100644 (file)
--- a/nscd/gai.c
+++ b/nscd/gai.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2004.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/getgrgid_r.c b/nscd/getgrgid_r.c
index 037509d8aaa8202c4e587f3522904578b9242ae5..297ebe769176ba76642747c63085f1a72234ba3b 100644 (file)
--- a/nscd/getgrgid_r.c
+++ b/nscd/getgrgid_r.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/getgrnam_r.c b/nscd/getgrnam_r.c
index 8fc74dcbafa83c15f8405c01f97c81f3dcfc4f11..55e69d0e033db90417d654b40d71deb06ed899c1 100644 (file)
--- a/nscd/getgrnam_r.c
+++ b/nscd/getgrnam_r.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/gethstbyad_r.c b/nscd/gethstbyad_r.c
index 4c02492101ddbcc9479336b3a11382257073b56b..e0cd82c32b756783e1659c2c2426a17523b55c0d 100644 (file)
--- a/nscd/gethstbyad_r.c
+++ b/nscd/gethstbyad_r.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/gethstbynm2_r.c b/nscd/gethstbynm2_r.c
index 416b5ceafa10868be13f9efb84c73ee0a804328d..abe992cc1c57c320b80a8b7867d7f2664210288b 100644 (file)
--- a/nscd/gethstbynm2_r.c
+++ b/nscd/gethstbynm2_r.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/getpwnam_r.c b/nscd/getpwnam_r.c
index c92209a0cf5f52d57d0d5c1849113d4d039941de..a1f7c3c872cc2c802c8698a9122932d18b821da9 100644 (file)
--- a/nscd/getpwnam_r.c
+++ b/nscd/getpwnam_r.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/getpwuid_r.c b/nscd/getpwuid_r.c
index f68951511e471f24589c7d5e1c59030a502ce66b..501c605b5b3869d4bd4d64f35bc02915f7411638 100644 (file)
--- a/nscd/getpwuid_r.c
+++ b/nscd/getpwuid_r.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/getsrvbynm_r.c b/nscd/getsrvbynm_r.c
index fb60f4802d54f788a155ef86381be655d5a60423..ebd344ac59e47a8068a763f331660f4685f1a648 100644 (file)
--- a/nscd/getsrvbynm_r.c
+++ b/nscd/getsrvbynm_r.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/getsrvbypt_r.c b/nscd/getsrvbypt_r.c
index fd5b11bc3d29b4e5e2321912bc61376a8ca8d13e..69abee15d99e4271966a49cf7253a5914e48d7cb 100644 (file)
--- a/nscd/getsrvbypt_r.c
+++ b/nscd/getsrvbypt_r.c
@@ -3,8 +3,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 3852e8ca7f03c079c7c5f0904be5492458807237..9cb6105f3cff35a07398096a496f03b1d2c0501b 100644 (file)
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index ad2e323eace61a724662fb3a98a1f0ebad862e65..3c9a17fee89918d6b56c45f8b018aa9581e30a39 100644 (file)
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index f1f859c552c55886640f682feb35c73f2a89e1ac..bb4ac37efc48683e7e2bf6d0b11968adb2cff5bf 100644 (file)
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/mem.c b/nscd/mem.c
index 5206c5af38b9dd6d1da8f894f5f86badd0dd48f2..d7c59244aa06f3f366f48f4a072c7c6127edd50b 100644 (file)
--- a/nscd/mem.c
+++ b/nscd/mem.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/nscd.c b/nscd/nscd.c
index ec7fceb3fabf0355ea283b9799b2de505b0cd5dc..e007694218b15306354f85352fc63b3ede52ad98 100644 (file)
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -3,8 +3,9 @@
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/nscd_conf.c b/nscd/nscd_conf.c
index e724c6bd59dc82051f8e2477ffc5e9bad540f2ac..0d5a5f2d8c84b3aba9019867a3dec9e6bd4356c0 100644 (file)
--- a/nscd/nscd_conf.c
+++ b/nscd/nscd_conf.c
@@ -3,8 +3,9 @@
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/nscd_setup_thread.c b/nscd/nscd_setup_thread.c
index 32bfe07000360a14593a049ca5a3f8a086c10d98..c17fbd5638e7298251f7466dde0f1ada97e8d4c3 100644 (file)
--- a/nscd/nscd_setup_thread.c
+++ b/nscd/nscd_setup_thread.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index ab41bcc0d566e2e4c30ebf16c4d143d2ceccf731..51ea113476bec6ecf00ac4ec9d82d913a485a9cd 100644 (file)
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/nscd/servicescache.c b/nscd/servicescache.c
index 8c3a9516bab20ee7dea4cd320d30a50097a78a01..89e107bae73c2f4b92e717f4064148d930b90777 100644 (file)
--- a/nscd/servicescache.c
+++ b/nscd/servicescache.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/posix/getconf.c b/posix/getconf.c
index c7a9d57628a394d4efdc8d3db8a08b3fb9b7e8a1..99f387feb7bbcdad774fa2c0590153c1621d1477 100644 (file)
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -2,8 +2,9 @@
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/sysdeps/unix/sysv/linux/nscd_setup_thread.c b/sysdeps/unix/sysv/linux/nscd_setup_thread.c
index 1589c24ea96bece28fd7d1fa9a1864b36d9c72d3..56e23dc831463da8793bc4bdc0a0df15a8013fc7 100644 (file)
--- a/sysdeps/unix/sysv/linux/nscd_setup_thread.c
+++ b/sysdeps/unix/sysv/linux/nscd_setup_thread.c
@@ -4,8 +4,9 @@
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
 
    This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
+   it under the terms of the GNU General Public License as published
+   by the Free Software Foundation; version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of