diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2022-01-01 10:24:28 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-01-01 10:25:39 -0800 |
commit | e3ffd3bbdd23d06f9efe114c4e0247e58444229b (patch) | |
tree | 13197a9734303016ddfdb7dd9f11e0ac488eb5a5 | |
parent | eec12c00cf3f8c649297cf13fbbac6b0a27676de (diff) | |
download | gnulib-e3ffd3bbdd23d06f9efe114c4e0247e58444229b.tar.gz |
maint: fix ‘make update-copyright’ on symlinks
After running ‘make update-copyright’ I noticed that it
incorrectly replaced a couple of symlinks with their contents.
* Makefile (update-copyright): Do not update symlinks.
* etc/license-notices/GPL, etc/license-notices/LGPL:
Change these back to symlinks.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | Makefile | 3 | ||||
l---------[-rw-r--r--] | etc/license-notices/GPL | 44 | ||||
l---------[-rw-r--r--] | etc/license-notices/LGPL | 29 |
4 files changed, 14 insertions, 71 deletions
@@ -1,3 +1,12 @@ +2022-01-01 Paul Eggert <eggert@cs.ucla.edu> + + maint: fix ‘make update-copyright’ on symlinks + After running ‘make update-copyright’ I noticed that it + incorrectly replaced a couple of symlinks with their contents. + * Makefile (update-copyright): Do not update symlinks. + * etc/license-notices/GPL, etc/license-notices/LGPL: + Change these back to symlinks. + 2021-12-31 Bruno Haible <bruno@clisp.org> unistdio: Prefer newer version to older, buggy one. @@ -173,6 +173,9 @@ update-copyright: done > $$exempt; \ git ls-files tests/unictype >> $$exempt; \ git ls-files doc/INSTALL* >> $$exempt; \ + for file in $$(git ls-files); do \ + test ! -h $$file || echo $$file; \ + done >> $$exempt; \ git ls-files | grep -vFf $$exempt \ | xargs grep -L '^/\*.*GENERATED AUTOMATICALLY' \ | UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 \ diff --git a/etc/license-notices/GPL b/etc/license-notices/GPL index f6b0d67689..fbd0cdcabe 100644..120000 --- a/etc/license-notices/GPL +++ b/etc/license-notices/GPL @@ -1,43 +1 @@ - - This file 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 3 of the License, - or (at your option) any later version. - - This file 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ - - - - * This file 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 3 of the License, - * or (at your option) any later version. - * - * This file 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - - - -# This file 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 3 of the License, -# or (at your option) any later version. -# -# This file 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. +GPLv3+
\ No newline at end of file diff --git a/etc/license-notices/LGPL b/etc/license-notices/LGPL index 5126fcf819..fc68c22a6c 100644..120000 --- a/etc/license-notices/LGPL +++ b/etc/license-notices/LGPL @@ -1,28 +1 @@ - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 3 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ - - - - * This file is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. - * - * This file 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. +LGPLv3+
\ No newline at end of file |