From f4563a292c31aaed45f1d74d59e334057bc9df41 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 23 Jun 2015 13:03:09 +0900 Subject: [PATCH] m4, help2man: Update from gnulib * gettext-runtime/m4/codeset.m4: Update copyright year. * gettext-runtime/m4/gettext.m4: Likewise. * gettext-runtime/m4/iconv.m4: Likewise. * gettext-runtime/m4/intl.m4: Likewise. * gettext-runtime/m4/intldir.m4: Likewise. * gettext-runtime/m4/intlmacosx.m4: Likewise. * gettext-runtime/m4/lcmessage.m4: Likewise. * gettext-runtime/m4/nls.m4: Likewise. * gettext-runtime/m4/po.m4: Likewise. * gettext-runtime/m4/extern-inline.m4: Likewise. Port the following change: 2015-04-29 Paul Eggert extern-inline: no need for workaround in GCC 5.1 * doc/extern-inline.texi (extern inline): * m4/extern-inline.m4 (gl_EXTERN_INLINE): GCC bugs 54113 and 63877 are fixed in GCC 5.1, so don't work around these bugs in GCC 5.1 and later. Maybe in a decade or two we can remove these workarounds. * gettext-tools/man/help2man: Update copyright year. --- gettext-runtime/ChangeLog | 20 ++++++++++++++++++++ gettext-runtime/m4/codeset.m4 | 2 +- gettext-runtime/m4/extern-inline.m4 | 5 +++-- gettext-runtime/m4/gettext.m4 | 2 +- gettext-runtime/m4/iconv.m4 | 2 +- gettext-runtime/m4/intl.m4 | 2 +- gettext-runtime/m4/intldir.m4 | 2 +- gettext-runtime/m4/intlmacosx.m4 | 2 +- gettext-runtime/m4/lcmessage.m4 | 2 +- gettext-runtime/m4/nls.m4 | 2 +- gettext-runtime/m4/po.m4 | 2 +- gettext-tools/man/ChangeLog | 4 ++++ gettext-tools/man/help2man | 2 +- 13 files changed, 37 insertions(+), 12 deletions(-) diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 4ba44f631..a07b5bed0 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,23 @@ +2015-06-23 Daiki Ueno + + * m4/codeset.m4: Update copyright year. + * m4/gettext.m4: Likewise. + * m4/iconv.m4: Likewise. + * m4/intl.m4: Likewise. + * m4/intldir.m4: Likewise. + * m4/intlmacosx.m4: Likewise. + * m4/lcmessage.m4: Likewise. + * m4/nls.m4: Likewise. + * m4/po.m4: Likewise. + * m4/extern-inline.m4: Likewise. Port the following change: + 2015-04-29 Paul Eggert + extern-inline: no need for workaround in GCC 5.1 + * doc/extern-inline.texi (extern inline): + * m4/extern-inline.m4 (gl_EXTERN_INLINE): + GCC bugs 54113 and 63877 are fixed in GCC 5.1, so don't work + around these bugs in GCC 5.1 and later. Maybe in a decade or + two we can remove these workarounds. + 2015-06-23 Daiki Ueno * ABOUT-NLS: Regenerate for 0.19.5. diff --git a/gettext-runtime/m4/codeset.m4 b/gettext-runtime/m4/codeset.m4 index 1c52ffc1b..d7de8d67e 100644 --- a/gettext-runtime/m4/codeset.m4 +++ b/gettext-runtime/m4/codeset.m4 @@ -1,5 +1,5 @@ # codeset.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2006, 2008-2015 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2006, 2008-2014 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/extern-inline.m4 b/gettext-runtime/m4/extern-inline.m4 index e74339a16..72800650e 100644 --- a/gettext-runtime/m4/extern-inline.m4 +++ b/gettext-runtime/m4/extern-inline.m4 @@ -74,12 +74,13 @@ AC_DEFUN([gl_EXTERN_INLINE], # define _GL_EXTERN_INLINE static _GL_UNUSED #endif -/* In GCC, suppress bogus "no previous prototype for 'FOO'" +/* In GCC 4.6 (inclusive) to 5.1 (exclusive), + suppress bogus "no previous prototype for 'FOO'" and "no previous declaration for 'FOO'" diagnostics, when FOO is an inline function in the header; see and . */ -#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ # define _GL_INLINE_HEADER_CONST_PRAGMA # else diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index ce5f5ea93..be247bf7b 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,5 +1,5 @@ # gettext.m4 serial 66 (gettext-0.18.2) -dnl Copyright (C) 1995-2015 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2014 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/iconv.m4 b/gettext-runtime/m4/iconv.m4 index 5a6c29bd8..4e3736315 100644 --- a/gettext-runtime/m4/iconv.m4 +++ b/gettext-runtime/m4/iconv.m4 @@ -1,5 +1,5 @@ # iconv.m4 serial 19 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2007-2015 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2007-2014 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/intl.m4 b/gettext-runtime/m4/intl.m4 index 87de63b39..0c29ad0df 100644 --- a/gettext-runtime/m4/intl.m4 +++ b/gettext-runtime/m4/intl.m4 @@ -1,5 +1,5 @@ # intl.m4 serial 28 (gettext-0.19) -dnl Copyright (C) 1995-2015 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2014 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/intldir.m4 b/gettext-runtime/m4/intldir.m4 index 116414838..73b672a57 100644 --- a/gettext-runtime/m4/intldir.m4 +++ b/gettext-runtime/m4/intldir.m4 @@ -1,5 +1,5 @@ # intldir.m4 serial 2 (gettext-0.18) -dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2014 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/intlmacosx.m4 b/gettext-runtime/m4/intlmacosx.m4 index 0d8d2988c..8a045f6a2 100644 --- a/gettext-runtime/m4/intlmacosx.m4 +++ b/gettext-runtime/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ # intlmacosx.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2004-2015 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 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/lcmessage.m4 b/gettext-runtime/m4/lcmessage.m4 index 2fcce61be..7470ec597 100644 --- a/gettext-runtime/m4/lcmessage.m4 +++ b/gettext-runtime/m4/lcmessage.m4 @@ -1,5 +1,5 @@ # lcmessage.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1995-2002, 2004-2005, 2008-2015 Free Software Foundation, +dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation, dnl 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/nls.m4 b/gettext-runtime/m4/nls.m4 index 33d66c188..53cdc8be8 100644 --- a/gettext-runtime/m4/nls.m4 +++ b/gettext-runtime/m4/nls.m4 @@ -1,5 +1,5 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2015 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl 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/po.m4 b/gettext-runtime/m4/po.m4 index c1e36ef2d..43012dca1 100644 --- a/gettext-runtime/m4/po.m4 +++ b/gettext-runtime/m4/po.m4 @@ -1,5 +1,5 @@ # po.m4 serial 24 (gettext-0.19) -dnl Copyright (C) 1995-2015 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2014 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/man/ChangeLog b/gettext-tools/man/ChangeLog index 061a80cef..75f05f25f 100644 --- a/gettext-tools/man/ChangeLog +++ b/gettext-tools/man/ChangeLog @@ -1,3 +1,7 @@ +2015-06-23 Daiki Ueno + + * help2man: Update copyright year. + 2014-12-24 Daiki Ueno * gettext 0.19.4 released. diff --git a/gettext-tools/man/help2man b/gettext-tools/man/help2man index e0a957b1c..1b6ad6543 100755 --- a/gettext-tools/man/help2man +++ b/gettext-tools/man/help2man @@ -31,7 +31,7 @@ my $this_version = '1.24'; my $version_info = <