From: Bruno Haible Date: Thu, 4 Apr 2024 14:15:29 +0000 (+0200) Subject: Fix macro file 'serial' numbers for 'aclocal --install'. X-Git-Tag: v0.23~261 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42f3e1c0e3666b1b824e46422f040f3745815918;p=thirdparty%2Fgettext.git Fix macro file 'serial' numbers for 'aclocal --install'. * gettext-runtime/m4/gettext.m4: Make 'serial' effective. * gettext-runtime/m4/glibc2.m4: Likewise. * gettext-runtime/m4/nls.m4: Likewise. * gettext-runtime/m4/po.m4: Likewise. * gettext-runtime/m4/progtest.m4: Likewise. * gettext-tools/m4/exported.m4: Likewise. * gettext-tools/m4/hostname.m4: Likewise. * gettext-tools/m4/locale-de.m4: Likewise. * libtextstyle/gnulib-local/m4/libcroco.m4: Likewise. * libtextstyle/gnulib-local/m4/libglib.m4: Likewise. * libtextstyle/gnulib-local/m4/moo.m4: Likewise. * libtextstyle/gnulib-local/m4/term-ostream.m4: Likewise. * libtextstyle/m4/init-package-version.m4: Likewise. * m4/fixautomake.m4: Likewise. * m4/more-warnings.m4: Likewise. * m4/woe32-dll.m4: Likewise. * gnulib-local/m4/java.m4: Likewise. * gnulib-local/m4/libxml.m4: Likewise. * gnulib-local/m4/backupfile.m4: Likewise. Make sure to override the gnulib version. --- diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index 5d47445d6..8cd3890b2 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,4 +1,5 @@ -# gettext.m4 serial 79 (gettext-0.23) +# gettext.m4 +# serial 79 (gettext-0.23) dnl Copyright (C) 1995-2014, 2016, 2018-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/gettext-runtime/m4/glibc2.m4 b/gettext-runtime/m4/glibc2.m4 index 17a700400..afa14a14b 100644 --- a/gettext-runtime/m4/glibc2.m4 +++ b/gettext-runtime/m4/glibc2.m4 @@ -1,6 +1,6 @@ -# glibc2.m4 serial 3 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2019 Free Software Foundation, -dnl Inc. +# glibc2.m4 +# serial 3 +dnl Copyright (C) 2000-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-runtime/m4/nls.m4 b/gettext-runtime/m4/nls.m4 index 4d37d37d4..219cbaa13 100644 --- a/gettext-runtime/m4/nls.m4 +++ b/gettext-runtime/m4/nls.m4 @@ -1,4 +1,5 @@ -# nls.m4 serial 6 (gettext-0.20.2) +# nls.m4 +# serial 6 (gettext-0.20.2) dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2024 Free dnl Software Foundation, Inc. dnl This file is free software; the Free Software Foundation diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4 index bc6df9918..56d0f3756 100644 --- a/gettext-runtime/m4/po.m4 +++ b/gettext-runtime/m4/po.m4 @@ -1,4 +1,5 @@ -# po.m4 serial 32 (gettext-0.21.1) +# po.m4 +# serial 32 (gettext-0.21.1) dnl Copyright (C) 1995-2014, 2016, 2018-2022, 2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation diff --git a/gettext-runtime/m4/progtest.m4 b/gettext-runtime/m4/progtest.m4 index 8dd4d606d..65ec1942a 100644 --- a/gettext-runtime/m4/progtest.m4 +++ b/gettext-runtime/m4/progtest.m4 @@ -1,4 +1,5 @@ -# progtest.m4 serial 10 (gettext-0.23) +# progtest.m4 +# serial 10 (gettext-0.23) dnl Copyright (C) 1996-2003, 2005, 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/gettext-tools/m4/exported.m4 b/gettext-tools/m4/exported.m4 index 2ee884f8b..0abcf4abd 100644 --- a/gettext-tools/m4/exported.m4 +++ b/gettext-tools/m4/exported.m4 @@ -1,5 +1,6 @@ -# exported.m4 serial 3 (gettext-0.21.1) -dnl Copyright (C) 2006, 2009, 2019-2020 Free Software Foundation, Inc. +# exported.m4 +# serial 3 (gettext-0.21.1) +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-tools/m4/hostname.m4 b/gettext-tools/m4/hostname.m4 index f66cd3911..b624dec58 100644 --- a/gettext-tools/m4/hostname.m4 +++ b/gettext-tools/m4/hostname.m4 @@ -1,5 +1,6 @@ -# hostname.m4 serial 2 (gettext-0.21.1) -dnl Copyright (C) 2001-2002, 2020 Free Software Foundation, Inc. +# hostname.m4 +# serial 2 (gettext-0.21.1) +dnl Copyright (C) 2001-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gettext-tools/m4/locale-de.m4 b/gettext-tools/m4/locale-de.m4 index adf00b3c3..5e262d885 100644 --- a/gettext-tools/m4/locale-de.m4 +++ b/gettext-tools/m4/locale-de.m4 @@ -1,5 +1,6 @@ -# locale-de.m4 serial 4 -dnl Copyright (C) 2003-2023 Free Software Foundation, Inc. +# locale-de.m4 +# serial 4 +dnl Copyright (C) 2003-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gnulib-local/m4/backupfile.m4 b/gnulib-local/m4/backupfile.m4 index 532bd5c9d..f5ae8da2d 100644 --- a/gnulib-local/m4/backupfile.m4 +++ b/gnulib-local/m4/backupfile.m4 @@ -1,5 +1,6 @@ -# backupfile.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc. +# backupfile.m4 +# serial 100 (gettext-0.15) +dnl Copyright (C) 2001-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gnulib-local/m4/java.m4 b/gnulib-local/m4/java.m4 index 1ad7fc18c..e7e82c2a7 100644 --- a/gnulib-local/m4/java.m4 +++ b/gnulib-local/m4/java.m4 @@ -1,5 +1,6 @@ -# java.m4 serial 2 -dnl Copyright (C) 2005, 2017 Free Software Foundation, Inc. +# java.m4 +# serial 2 +dnl Copyright (C) 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4 index 034049045..c7160d7b7 100644 --- a/gnulib-local/m4/libxml.m4 +++ b/gnulib-local/m4/libxml.m4 @@ -1,5 +1,6 @@ -# libxml.m4 serial 10 -dnl Copyright (C) 2006, 2008, 2011, 2013, 2016, 2019-2020 Free Software Foundation, Inc. +# libxml.m4 +# serial 10 +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4 index 39e72b151..ecc85f1a7 100644 --- a/libtextstyle/gnulib-local/m4/libcroco.m4 +++ b/libtextstyle/gnulib-local/m4/libcroco.m4 @@ -1,5 +1,6 @@ -# libcroco.m4 serial 4 -dnl Copyright (C) 2006-2007, 2019-2020 Free Software Foundation, Inc. +# libcroco.m4 +# serial 4 +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 index dbc9eb82a..baa2cf4ae 100644 --- a/libtextstyle/gnulib-local/m4/libglib.m4 +++ b/libtextstyle/gnulib-local/m4/libglib.m4 @@ -1,5 +1,6 @@ -# libglib.m4 serial 7 -dnl Copyright (C) 2006-2007, 2019-2023 Free Software Foundation, Inc. +# libglib.m4 +# serial 7 +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/libtextstyle/gnulib-local/m4/moo.m4 b/libtextstyle/gnulib-local/m4/moo.m4 index 737427e92..a5b190a3d 100644 --- a/libtextstyle/gnulib-local/m4/moo.m4 +++ b/libtextstyle/gnulib-local/m4/moo.m4 @@ -1,5 +1,6 @@ -# moo.m4 serial 1 (gettext-0.17) -dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. +# moo.m4 +# serial 1 (gettext-0.17) +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/libtextstyle/gnulib-local/m4/term-ostream.m4 b/libtextstyle/gnulib-local/m4/term-ostream.m4 index c8eb47782..815e8dfcd 100644 --- a/libtextstyle/gnulib-local/m4/term-ostream.m4 +++ b/libtextstyle/gnulib-local/m4/term-ostream.m4 @@ -1,5 +1,6 @@ -# term-ostream.m4 serial 5 -dnl Copyright (C) 2006, 2019 Free Software Foundation, Inc. +# term-ostream.m4 +# serial 5 +dnl Copyright (C) 2006-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/libtextstyle/m4/init-package-version.m4 b/libtextstyle/m4/init-package-version.m4 index 823afc6f7..853b6fb79 100644 --- a/libtextstyle/m4/init-package-version.m4 +++ b/libtextstyle/m4/init-package-version.m4 @@ -1,5 +1,6 @@ -# init-package-version.m4 serial 3 -dnl Copyright (C) 1992-2021 Free Software Foundation, Inc. +# init-package-version.m4 +# serial 3 +dnl Copyright (C) 1992-2024 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4 index 989220db1..035c56921 100644 --- a/m4/fixautomake.m4 +++ b/m4/fixautomake.m4 @@ -1,5 +1,6 @@ -# fixautomake.m4 serial 8 (gettext-0.18) -dnl Copyright (C) 2002-2003, 2006, 2009 Free Software Foundation, Inc. +# fixautomake.m4 +# serial 8 (gettext-0.18) +dnl Copyright (C) 2002-2024 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program diff --git a/m4/more-warnings.m4 b/m4/more-warnings.m4 index 5a45ee523..13fb27d79 100644 --- a/m4/more-warnings.m4 +++ b/m4/more-warnings.m4 @@ -1,5 +1,6 @@ -# more-warnings.m4 serial 3 (gettext-0.23) -dnl Copyright (C) 2023 Free Software Foundation, Inc. +# more-warnings.m4 +# serial 3 (gettext-0.23) +dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program diff --git a/m4/woe32-dll.m4 b/m4/woe32-dll.m4 index aab03d1b7..7b0d5eea0 100644 --- a/m4/woe32-dll.m4 +++ b/m4/woe32-dll.m4 @@ -1,5 +1,6 @@ -# woe32-dll.m4 serial 7 -dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. +# woe32-dll.m4 +# serial 7 +dnl Copyright (C) 2005-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved.