intl: Update from gnulib

* config.charset, localcharset.c, relocatable.c, vasnprintf.c:
Update from gnulib.
* codeset.m4, extern-inline.m4, fcntl-o.m4, gettext.m4, glibc2.m4:
* glibc21.m4, iconv.m4, intdiv0.m4, intldir.m4, intlmacosx.m4:
* intmax.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lock.m4:
* longlong.m4, nls.m4, printf-posix.m4, progtest.m4:
* size_max.m4, stdint_h.m4, threadlib.m4, uintmax_t.m4:
* visibility.m4, wchar_t.m4, wint_t.m4, xsize.m4: Update copyright
year.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 1d4971fbcbddf93eda2d1c3e2d9f30b17487eb5c..d32774ca534a77f6e1c23ded75a8569fa8ad2b53 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,16 @@
+2015-01-22  Daiki Ueno  <ueno@gnu.org>
+
+       intl: Update from gnulib
+       * config.charset, localcharset.c, relocatable.c, vasnprintf.c:
+       Update from gnulib.
+       * codeset.m4, extern-inline.m4, fcntl-o.m4, gettext.m4, glibc2.m4:
+       * glibc21.m4, iconv.m4, intdiv0.m4, intldir.m4, intlmacosx.m4:
+       * intmax.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lock.m4:
+       * longlong.m4, nls.m4, printf-posix.m4, progtest.m4:
+       * size_max.m4, stdint_h.m4, threadlib.m4, uintmax_t.m4:
+       * visibility.m4, wchar_t.m4, wint_t.m4, xsize.m4: Update copyright
+       year.
+
 2015-01-21  Will Newton  <will.newton@linaro.org>
 
        intl: Merge from glibc

diff --git a/gettext-runtime/intl/config.charset b/gettext-runtime/intl/config.charset
index fdf6535dcd89d6725c799b69ea28f33baaa4fcf6..32788ffedef0c33e183d2e302769e209e53d9ba4 100644 (file)
--- a/gettext-runtime/intl/config.charset
+++ b/gettext-runtime/intl/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2010 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2015 Free Software Foundation, Inc.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Lesser General Public License as published by
@@ -348,12 +348,10 @@ case "$os" in
     #echo "sun_eu_greek ?" # what is this?
     echo "UTF-8 UTF-8"
     ;;
-  freebsd* | os2*)
+  freebsd*)
     # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
     # localcharset.c falls back to using the full locale name
     # from the environment variables.
-    # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
-    # reuse FreeBSD's locale data for OS/2.
     echo "C ASCII"
     echo "US-ASCII ASCII"
     for l in la_LN lt_LN; do

diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index e63622efcfa51f98259551ebe0db6935d153e82d..213e726fb922610bf31f4f40c8f50b4f9555e1cd 100644 (file)
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -128,7 +128,7 @@ get_charset_aliases (void)
   cp = charset_aliases;
   if (cp == NULL)
     {
-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2)
       const char *dir;
       const char *base = "charset.alias";
       char *file_name;
@@ -342,6 +342,36 @@ get_charset_aliases (void)
            "CP54936" "\0" "GB18030" "\0"
            "CP65001" "\0" "UTF-8" "\0";
 # endif
+# if defined OS2
+      /* To avoid the troubles of installing a separate file in the same
+         directory as the DLL and of retrieving the DLL's directory at
+         runtime, simply inline the aliases here.  */
+
+      /* The list of encodings is taken from "List of OS/2 Codepages"
+         by Alex Taylor:
+         <http://altsan.org/os2/toolkits/uls/index.html#codepages>.
+         See also "IBM Globalization - Code page identifiers":
+         <http://www-01.ibm.com/software/globalization/cp/cp_cpgid.html>.  */
+      cp = "CP813" "\0" "ISO-8859-7" "\0"
+           "CP878" "\0" "KOI8-R" "\0"
+           "CP819" "\0" "ISO-8859-1" "\0"
+           "CP912" "\0" "ISO-8859-2" "\0"
+           "CP913" "\0" "ISO-8859-3" "\0"
+           "CP914" "\0" "ISO-8859-4" "\0"
+           "CP915" "\0" "ISO-8859-5" "\0"
+           "CP916" "\0" "ISO-8859-8" "\0"
+           "CP920" "\0" "ISO-8859-9" "\0"
+           "CP921" "\0" "ISO-8859-13" "\0"
+           "CP923" "\0" "ISO-8859-15" "\0"
+           "CP954" "\0" "EUC-JP" "\0"
+           "CP964" "\0" "EUC-TW" "\0"
+           "CP970" "\0" "EUC-KR" "\0"
+           "CP1089" "\0" "ISO-8859-6" "\0"
+           "CP1208" "\0" "UTF-8" "\0"
+           "CP1381" "\0" "GB2312" "\0"
+           "CP1386" "\0" "GBK" "\0"
+           "CP3372" "\0" "EUC-JP" "\0";
+# endif
 #endif
 
       charset_aliases = cp;
@@ -499,6 +529,8 @@ locale_charset (void)
   ULONG cp[3];
   ULONG cplen;
 
+  codeset = NULL;
+
   /* Allow user to override the codeset, as set in the operating system,
      with standard language environment variables.  */
   locale = getenv ("LC_ALL");
@@ -530,10 +562,12 @@ locale_charset (void)
             }
         }
 
-      /* Resolve through the charset.alias file.  */
-      codeset = locale;
+      /* For the POSIX locale, don't use the system's codepage.  */
+      if (strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0)
+        codeset = "";
     }
-  else
+
+  if (codeset == NULL)
     {
       /* OS/2 has a function returning the locale's codepage as a number.  */
       if (DosQueryCp (sizeof (cp), cp, &cplen))

diff --git a/gettext-runtime/intl/relocatable.c b/gettext-runtime/intl/relocatable.c
index 7536f6ca1309663ff9e170c089ad826e92307aa1..66532b40d6e421eaec1efe2b555c6618587df6dd 100644 (file)
--- a/gettext-runtime/intl/relocatable.c
+++ b/gettext-runtime/intl/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -47,6 +47,14 @@
 # include <windows.h>
 #endif
 
+#ifdef __EMX__
+# define INCL_DOS
+# include <os2.h>
+
+# define strcmp  stricmp
+# define strncmp strnicmp
+#endif
+
 #if DEPENDS_ON_LIBCHARSET
 # include <libcharset.h>
 #endif
@@ -335,6 +343,45 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
   return TRUE;
 }
 
+#elif defined __EMX__
+
+extern int  _CRT_init (void);
+extern void _CRT_term (void);
+extern void __ctordtorInit (void);
+extern void __ctordtorTerm (void);
+
+unsigned long _System
+_DLL_InitTerm (unsigned long hModule, unsigned long ulFlag)
+{
+  static char location[CCHMAXPATH];
+
+  switch (ulFlag)
+    {
+      case 0:
+        if (_CRT_init () == -1)
+          return 0;
+
+        __ctordtorInit();
+
+        /* See http://cyberkinetica.homeunix.net/os2tk45/cp1/1247_L2H_DosQueryModuleNameSy.html
+           for specification of DosQueryModuleName(). */
+        if (DosQueryModuleName (hModule, sizeof (location), location))
+          return 0;
+
+        _fnslashify (location);
+        shared_library_fullname = strdup (location);
+        break;
+
+      case 1:
+        __ctordtorTerm();
+
+        _CRT_term ();
+        break;
+    }
+
+  return 1;
+}
+
 #else /* Unix */
 
 static void
@@ -390,15 +437,16 @@ find_shared_library_fullname ()
 #endif
 }
 
-#endif /* Native Windows / Unix */
+#endif /* Native Windows / EMX / Unix */
 
 /* Return the full pathname of the current shared library.
    Return NULL if unknown.
-   Guaranteed to work only on Linux, Cygwin, and native Windows.  */
+   Guaranteed to work only on Linux, EMX, Cygwin, and native Windows.  */
 static char *
 get_shared_library_fullname ()
 {
-#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
+#if (!((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) \
+     && !defined __EMX__)
   static bool tried_find_shared_library_fullname;
   if (!tried_find_shared_library_fullname)
     {
@@ -489,6 +537,27 @@ relocate (const char *pathname)
             }
         }
     }
+
+#ifdef __EMX__
+  if (pathname && ISSLASH (pathname[0]))
+    {
+      const char *unixroot = getenv ("UNIXROOT");
+
+      if (unixroot && HAS_DEVICE (unixroot) && !unixroot[2])
+        {
+          char *result = (char *) xmalloc (2 + strlen (pathname) + 1);
+#ifdef NO_XMALLOC
+          if (result != NULL)
+#endif
+            {
+              strcpy (result, unixroot);
+              strcpy (result + 2, pathname);
+              return result;
+            }
+        }
+    }
+#endif
+
   /* Nothing to relocate.  */
   return pathname;
 }

diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index 7e326f85eae036db37d0ce15027414d68047cafb..a97f6134a3805f2b651f9536bdcb573bfd663cab 100644 (file)
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -5179,18 +5179,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         /* SNPRINTF or sprintf failed.  Save and use the errno
                            that it has set, if any.  */
                         int saved_errno = errno;
+                        if (saved_errno == 0)
+                          {
+                            if (dp->conversion == 'c' || dp->conversion == 's')
+                              saved_errno = EILSEQ;
+                            else
+                              saved_errno = EINVAL;
+                          }
 
                         if (!(result == resultbuf || result == NULL))
                           free (result);
                         if (buf_malloced != NULL)
                           free (buf_malloced);
                         CLEANUP ();
-                        errno =
-                          (saved_errno != 0
-                           ? saved_errno
-                           : (dp->conversion == 'c' || dp->conversion == 's'
-                              ? EILSEQ
-                              : EINVAL));
+
+                        errno = saved_errno;
                         return NULL;
                       }
 

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 55a2d2988d79f1598d93e83e64dfea5b441ad62e..3eb0aed2c54250a97cbe07f6ec24090f1fec8e5d 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-22  Daiki Ueno  <ueno@gnu.org>
+
+       * vasnprintf.c: Update copyright year.
+
 2014-12-24  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19.4 released.

diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index 7e326f85eae036db37d0ce15027414d68047cafb..a97f6134a3805f2b651f9536bdcb573bfd663cab 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -5179,18 +5179,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         /* SNPRINTF or sprintf failed.  Save and use the errno
                            that it has set, if any.  */
                         int saved_errno = errno;
+                        if (saved_errno == 0)
+                          {
+                            if (dp->conversion == 'c' || dp->conversion == 's')
+                              saved_errno = EILSEQ;
+                            else
+                              saved_errno = EINVAL;
+                          }
 
                         if (!(result == resultbuf || result == NULL))
                           free (result);
                         if (buf_malloced != NULL)
                           free (buf_malloced);
                         CLEANUP ();
-                        errno =
-                          (saved_errno != 0
-                           ? saved_errno
-                           : (dp->conversion == 'c' || dp->conversion == 's'
-                              ? EILSEQ
-                              : EINVAL));
+
+                        errno = saved_errno;
                         return NULL;
                       }
 

diff --git a/gettext-runtime/m4/codeset.m4 b/gettext-runtime/m4/codeset.m4
index d7de8d67e0d2c0a70dcdb911f6ac7893d2c3bca4..1c52ffc1be16d1e3408f085cb2d062b3779ef13b 100644 (file)
--- 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-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2015 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 0edbe3c81c6f5f25420410f84a1ead33f1f3c9bc..e74339a165e0a78085d550a30a119ad012a1ca2e 100644 (file)
--- a/gettext-runtime/m4/extern-inline.m4
+++ b/gettext-runtime/m4/extern-inline.m4
@@ -1,6 +1,6 @@
 dnl 'extern inline' a la ISO C99.
 
-dnl Copyright 2012-2014 Free Software Foundation, Inc.
+dnl Copyright 2012-2015 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/fcntl-o.m4 b/gettext-runtime/m4/fcntl-o.m4
index 43c93124ed5874a66282ed01b365a4fcfb9c1632..891a62fb6a36a93332669c95235c6d1b383a1aff 100644 (file)
--- a/gettext-runtime/m4/fcntl-o.m4
+++ b/gettext-runtime/m4/fcntl-o.m4
@@ -1,5 +1,5 @@
 # fcntl-o.m4 serial 4
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2015 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/gettext.m4 b/gettext-runtime/m4/gettext.m4
index be247bf7b88860d0f565884bd192d44f6e23e9ec..ce5f5ea93a5b438017154fed8f5b48c440df17e2 100644 (file)
--- 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-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2015 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/glibc2.m4 b/gettext-runtime/m4/glibc2.m4
index 71dd8a1234b62e4c9efcf017f59ddf90ea0345bd..216c8630805824f9d9098592b9ed7a9c75570f8d 100644 (file)
--- a/gettext-runtime/m4/glibc2.m4
+++ b/gettext-runtime/m4/glibc2.m4
@@ -1,5 +1,5 @@
 # glibc2.m4 serial 3
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2015 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/glibc21.m4 b/gettext-runtime/m4/glibc21.m4
index ab58b712137677e1f8aafd8ee561dad5ffac77aa..3a971c5a240f82b560815d9a1ffd52c1bdca46fa 100644 (file)
--- a/gettext-runtime/m4/glibc21.m4
+++ b/gettext-runtime/m4/glibc21.m4
@@ -1,5 +1,5 @@
 # glibc21.m4 serial 5
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2015 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/iconv.m4 b/gettext-runtime/m4/iconv.m4
index 4e37363156620d7b2dd33996846464ae3a3c4b2c..5a6c29bd8960adc3dc658d7a1ad9c3bf526fb780 100644 (file)
--- 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-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2015 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/intdiv0.m4 b/gettext-runtime/m4/intdiv0.m4
index afa9acb82c0cdfffdb779830780f07b69002b0da..44f986325b8a5430e4b2d830f6636b5d5d906cc5 100644 (file)
--- a/gettext-runtime/m4/intdiv0.m4
+++ b/gettext-runtime/m4/intdiv0.m4
@@ -1,5 +1,5 @@
 # intdiv0.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002, 2007-2008, 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2008, 2010-2015 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 73b672a576864378bf9be74652f32d86953d0cef..11641483811e8bc9ea79dfb19bb333166d009f35 100644 (file)
--- 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-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2015 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 8a045f6a295781c3c08e38df8d053e30011b65f1..0d8d2988c9b6cf78e9aaf1b8be9afb589e9b5462 100644 (file)
--- 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-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2015 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/intmax.m4 b/gettext-runtime/m4/intmax.m4
index f70ceeea1b5017fa501a2aca661b1c76c30d556e..08b3a382e6bb5b032e3b5655dfbbd085af00e59f 100644 (file)
--- a/gettext-runtime/m4/intmax.m4
+++ b/gettext-runtime/m4/intmax.m4
@@ -1,5 +1,5 @@
 # intmax.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002-2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2005, 2008-2015 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/inttypes-pri.m4 b/gettext-runtime/m4/inttypes-pri.m4
index 00251e1dbf487ceaf58c48c925da23312bee5cf4..0884e71e6722a59e00a160afa58127b7f1086390 100644 (file)
--- a/gettext-runtime/m4/inttypes-pri.m4
+++ b/gettext-runtime/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
 # inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2015 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/inttypes_h.m4 b/gettext-runtime/m4/inttypes_h.m4
index 87be9cfb560a4ccf09b45f8a0aa3db8fb477255f..d0b5f5d98298824228a36d63943c26c4733c3672 100644 (file)
--- a/gettext-runtime/m4/inttypes_h.m4
+++ b/gettext-runtime/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
 # inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2015 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 7470ec5973ad7e98438b1786153ce76505583c05..2fcce61be849ad12a68f61c29b9f1b6aaabca470 100644 (file)
--- 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-2014 Free Software Foundation,
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2015 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/lock.m4 b/gettext-runtime/m4/lock.m4
index 73a3c54cee8f290e8382308ae766709de182c203..9fd4aa78d207a1c5ceddca355323081a2ca3b7bb 100644 (file)
--- a/gettext-runtime/m4/lock.m4
+++ b/gettext-runtime/m4/lock.m4
@@ -1,5 +1,5 @@
 # lock.m4 serial 13 (gettext-0.18.2)
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2015 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/longlong.m4 b/gettext-runtime/m4/longlong.m4
index eefb37c455eba6d20963c8756825ae243a0d0fa8..d57bc700d4f5c5bacbc6bda57798073913c93c9e 100644 (file)
--- a/gettext-runtime/m4/longlong.m4
+++ b/gettext-runtime/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2015 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 53cdc8be8becc87942a1fcd7ea1ef088f98d81ac..33d66c188d325a8aea3f32e60c2066988938e168 100644 (file)
--- 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-2014 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2015 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/printf-posix.m4 b/gettext-runtime/m4/printf-posix.m4
index 3be95c130ae31d71c0191981089dad6a6d0b895f..0f85ad61af2867678452dc394349b7771d3a0237 100644 (file)
--- a/gettext-runtime/m4/printf-posix.m4
+++ b/gettext-runtime/m4/printf-posix.m4
@@ -1,5 +1,5 @@
 # printf-posix.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2015 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/progtest.m4 b/gettext-runtime/m4/progtest.m4
index b499f79cf39b24b8ead7ff83298781e4086595ec..8706d526986b042adc57fe202389af6f23a314b5 100644 (file)
--- a/gettext-runtime/m4/progtest.m4
+++ b/gettext-runtime/m4/progtest.m4
@@ -1,5 +1,5 @@
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2015 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/size_max.m4 b/gettext-runtime/m4/size_max.m4
index 7e192d5e962e858295d3f066ee14a0ebce3efb85..186e3fddabf374042cb0955d29408ec49409c2f0 100644 (file)
--- a/gettext-runtime/m4/size_max.m4
+++ b/gettext-runtime/m4/size_max.m4
@@ -1,5 +1,5 @@
 # size_max.m4 serial 10
-dnl Copyright (C) 2003, 2005-2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2006, 2008-2015 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/stdint_h.m4 b/gettext-runtime/m4/stdint_h.m4
index 7fc2ce9a83842cfc85ca1b444ff9b4a8bb126d12..5097c0b0dcbd73c847e43543d8e0848111e140a2 100644 (file)
--- a/gettext-runtime/m4/stdint_h.m4
+++ b/gettext-runtime/m4/stdint_h.m4
@@ -1,5 +1,5 @@
 # stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2015 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/threadlib.m4 b/gettext-runtime/m4/threadlib.m4
index dc9a3d8e8442cac5529422d9c8ef3fe9ee52c415..8615ac94e1d1e82ebefc663d09710c13d96cd67c 100644 (file)
--- a/gettext-runtime/m4/threadlib.m4
+++ b/gettext-runtime/m4/threadlib.m4
@@ -1,5 +1,5 @@
 # threadlib.m4 serial 11 (gettext-0.18.2)
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2015 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/uintmax_t.m4 b/gettext-runtime/m4/uintmax_t.m4
index 0a94f17fb2b5d1727456b61179bef02e66f159d0..8a92f58e101d099967dd343d42f1db6478a0f41f 100644 (file)
--- a/gettext-runtime/m4/uintmax_t.m4
+++ b/gettext-runtime/m4/uintmax_t.m4
@@ -1,5 +1,5 @@
 # uintmax_t.m4 serial 12
-dnl Copyright (C) 1997-2004, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2007-2015 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/visibility.m4 b/gettext-runtime/m4/visibility.m4
index 552e39772d2fdd1a9637e1d82e2ad06c7c6b562e..6fff7459ccbea14520b27d43b5965a5c7cae40aa 100644 (file)
--- a/gettext-runtime/m4/visibility.m4
+++ b/gettext-runtime/m4/visibility.m4
@@ -1,5 +1,5 @@
 # visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2010-2015 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/wchar_t.m4 b/gettext-runtime/m4/wchar_t.m4
index 839a04c17c34f4fb0b22ef1e18465fd271e3d806..dc964e67e261d0166afb14b4dcb45872d6b114fd 100644 (file)
--- a/gettext-runtime/m4/wchar_t.m4
+++ b/gettext-runtime/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2015 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/wint_t.m4 b/gettext-runtime/m4/wint_t.m4
index 9b07b07090054edd2a4340698be18b2bbc0b7a7e..ca3fd449a14ec3127a14070cbdb76b8db44225e7 100644 (file)
--- a/gettext-runtime/m4/wint_t.m4
+++ b/gettext-runtime/m4/wint_t.m4
@@ -1,5 +1,5 @@
 # wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2015 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/xsize.m4 b/gettext-runtime/m4/xsize.m4
index 3af23ec75b85d278ad64a47daf318ecb74fc0413..98faf7de0b27391e10c9dd6a792f46457f84f6e3 100644 (file)
--- a/gettext-runtime/m4/xsize.m4
+++ b/gettext-runtime/m4/xsize.m4
@@ -1,5 +1,5 @@
 # xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2008-2015 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.