From e3ffd3bbdd23d06f9efe114c4e0247e58444229b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 1 Jan 2022 10:24:28 -0800 Subject: [PATCH] =?utf8?q?maint:=20fix=20=E2=80=98make=20update-copyright?= =?utf8?q?=E2=80=99=20on=20symlinks?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- ChangeLog | 9 ++++++++ Makefile | 3 +++ etc/license-notices/GPL | 44 +--------------------------------------- etc/license-notices/LGPL | 29 +------------------------- 4 files changed, 14 insertions(+), 71 deletions(-) mode change 100644 => 120000 etc/license-notices/GPL mode change 100644 => 120000 etc/license-notices/LGPL diff --git a/ChangeLog b/ChangeLog index e2f467e75b..28d95dedec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2022-01-01 Paul Eggert + + 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 unistdio: Prefer newer version to older, buggy one. diff --git a/Makefile b/Makefile index 913407fa78..85362c8c2c 100644 --- a/Makefile +++ b/Makefile @@ -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 deleted file mode 100644 index f6b0d67689..0000000000 --- a/etc/license-notices/GPL +++ /dev/null @@ -1,43 +0,0 @@ - - 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 . */ - - - - * 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 . - - - -# 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 . diff --git a/etc/license-notices/GPL b/etc/license-notices/GPL new file mode 120000 index 0000000000..fbd0cdcabe --- /dev/null +++ b/etc/license-notices/GPL @@ -0,0 +1 @@ +GPLv3+ \ No newline at end of file diff --git a/etc/license-notices/LGPL b/etc/license-notices/LGPL deleted file mode 100644 index 5126fcf819..0000000000 --- a/etc/license-notices/LGPL +++ /dev/null @@ -1,28 +0,0 @@ - - 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 . */ - - - - * 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 . diff --git a/etc/license-notices/LGPL b/etc/license-notices/LGPL new file mode 120000 index 0000000000..fc68c22a6c --- /dev/null +++ b/etc/license-notices/LGPL @@ -0,0 +1 @@ +LGPLv3+ \ No newline at end of file -- 2.39.5