diff options
author | Bruno Haible <bruno@clisp.org> | 2011-08-07 15:16:56 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2011-08-07 19:48:03 +0200 |
commit | 4d036b9a0e5016694d93e1063aa06e00ede5ee74 (patch) | |
tree | 791ce59a141df9e7371768dd720b7b53be4fb9b3 | |
parent | 61400e7db68959cf60aa74d4165263bce30fee3f (diff) | |
download | android-libiconv-4d036b9a0e5016694d93e1063aa06e00ede5ee74.tar.gz android-libiconv-4d036b9a0e5016694d93e1063aa06e00ede5ee74.tar.bz2 android-libiconv-4d036b9a0e5016694d93e1063aa06e00ede5ee74.zip |
Prepare for version 1.14.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | include/iconv.h.in | 4 | ||||
-rw-r--r-- | lib/Makefile.in | 2 | ||||
-rw-r--r-- | src/iconv.c | 2 | ||||
-rw-r--r-- | windows/iconv.rc | 2 |
7 files changed, 17 insertions, 8 deletions
@@ -1,5 +1,14 @@ 2011-08-07 Bruno Haible <bruno@clisp.org> + * configure.ac: Bump version number to 1.14. + * README: Likewise. + * include/iconv.h.in (_LIBICONV_VERSION): Likewise. + * windows/iconv.rc: Update. + * lib/Makefile.in (LIBICONV_VERSION_INFO): Bump to 7:1:5. + * src/iconv.c (print_version): Update copyright year. + +2011-08-07 Bruno Haible <bruno@clisp.org> + Avoid a test failure on Solaris 2.6 and HP-UX 11.00. * tests/test-to-wchar.c (main): Skip the test if conversion to wchar_t is not supported. @@ -155,7 +155,7 @@ The iconv _program_ and the documentation are under GPL, see file COPYING. Download -------- - http://ftp.gnu.org/gnu/libiconv/libiconv-1.13.1.tar.gz + http://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz Homepage -------- diff --git a/configure.ac b/configure.ac index 72a28fa..12f88df 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl Copyright (C) 1999-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2011 Free Software Foundation, Inc. dnl This file is part of the GNU LIBICONV Library. dnl dnl The GNU LIBICONV Library is free software; you can redistribute it @@ -20,7 +20,7 @@ AC_PREREQ([2.60]) AC_INIT AC_CONFIG_SRCDIR([lib/iconv.c]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([libiconv], [1.13.1]) +AM_INIT_AUTOMAKE([libiconv], [1.14]) AC_CONFIG_HEADERS([config.h lib/config.h]) AC_PROG_MAKE_SET diff --git a/include/iconv.h.in b/include/iconv.h.in index 0155ec8..9dc3c1e 100644 --- a/include/iconv.h.in +++ b/include/iconv.h.in @@ -1,4 +1,4 @@ -/* Copyright (C) 1999-2003, 2005-2006, 2008-2010 Free Software Foundation, Inc. +/* Copyright (C) 1999-2003, 2005-2006, 2008-2011 Free Software Foundation, Inc. This file is part of the GNU LIBICONV Library. The GNU LIBICONV Library is free software; you can redistribute it @@ -21,7 +21,7 @@ #ifndef _LIBICONV_H #define _LIBICONV_H -#define _LIBICONV_VERSION 0x010D /* version number: (major<<8) + minor */ +#define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */ extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */ /* We would like to #include any system header file which could define diff --git a/lib/Makefile.in b/lib/Makefile.in index 0f76ea6..a538cce 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -50,7 +50,7 @@ SHELL = /bin/sh # Before making a release, change this according to the libtool documentation, # section "Library interface versions". -LIBICONV_VERSION_INFO = 7:0:5 +LIBICONV_VERSION_INFO = 7:1:5 PACKAGE_VERSION = @VERSION@ diff --git a/src/iconv.c b/src/iconv.c index d85ae27..825ef22 100644 --- a/src/iconv.c +++ b/src/iconv.c @@ -191,7 +191,7 @@ static void print_version (void) { printf("iconv (GNU libiconv %d.%d)\n", _libiconv_version >> 8, _libiconv_version & 0xff); - printf("Copyright (C) %s Free Software Foundation, Inc.\n", "2000-2009"); + printf("Copyright (C) %s Free Software Foundation, Inc.\n", "2000-2011"); /* xgettext: no-wrap */ fputs (_("\ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\ diff --git a/windows/iconv.rc b/windows/iconv.rc index 6349bbf..37eb003 100644 --- a/windows/iconv.rc +++ b/windows/iconv.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "GPLed iconv for Windows NT/2000/XP/Vista/7\0" VALUE "FileVersion", PACKAGE_VERSION_STRING "\0" VALUE "InternalName", "iconv.exe\0" - VALUE "LegalCopyright", "Copyright (C) 1999-2009\0" + VALUE "LegalCopyright", "Copyright (C) 1999-2011\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "iconv.exe\0" VALUE "ProductName", "iconv: character set conversion program\0" |