Skip to content

Commit 4d036b9

Browse files
committed
Prepare for version 1.14.
1 parent 61400e7 commit 4d036b9

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2011-08-07 Bruno Haible <bruno@clisp.org>
2+
3+
* configure.ac: Bump version number to 1.14.
4+
* README: Likewise.
5+
* include/iconv.h.in (_LIBICONV_VERSION): Likewise.
6+
* windows/iconv.rc: Update.
7+
* lib/Makefile.in (LIBICONV_VERSION_INFO): Bump to 7:1:5.
8+
* src/iconv.c (print_version): Update copyright year.
9+
110
2011-08-07 Bruno Haible <bruno@clisp.org>
211

312
Avoid a test failure on Solaris 2.6 and HP-UX 11.00.

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The iconv _program_ and the documentation are under GPL, see file COPYING.
155155
Download
156156
--------
157157

158-
http://ftp.gnu.org/gnu/libiconv/libiconv-1.13.1.tar.gz
158+
http://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz
159159

160160
Homepage
161161
--------

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dnl Copyright (C) 1999-2010 Free Software Foundation, Inc.
1+
dnl Copyright (C) 1999-2011 Free Software Foundation, Inc.
22
dnl This file is part of the GNU LIBICONV Library.
33
dnl
44
dnl The GNU LIBICONV Library is free software; you can redistribute it
@@ -20,7 +20,7 @@ AC_PREREQ([2.60])
2020
AC_INIT
2121
AC_CONFIG_SRCDIR([lib/iconv.c])
2222
AC_CONFIG_AUX_DIR([build-aux])
23-
AM_INIT_AUTOMAKE([libiconv], [1.13.1])
23+
AM_INIT_AUTOMAKE([libiconv], [1.14])
2424
AC_CONFIG_HEADERS([config.h lib/config.h])
2525
AC_PROG_MAKE_SET
2626

include/iconv.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (C) 1999-2003, 2005-2006, 2008-2010 Free Software Foundation, Inc.
1+
/* Copyright (C) 1999-2003, 2005-2006, 2008-2011 Free Software Foundation, Inc.
22
This file is part of the GNU LIBICONV Library.
33
44
The GNU LIBICONV Library is free software; you can redistribute it
@@ -21,7 +21,7 @@
2121
#ifndef _LIBICONV_H
2222
#define _LIBICONV_H
2323

24-
#define _LIBICONV_VERSION 0x010D /* version number: (major<<8) + minor */
24+
#define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */
2525
extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
2626

2727
/* We would like to #include any system header file which could define

lib/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ SHELL = /bin/sh
5050

5151
# Before making a release, change this according to the libtool documentation,
5252
# section "Library interface versions".
53-
LIBICONV_VERSION_INFO = 7:0:5
53+
LIBICONV_VERSION_INFO = 7:1:5
5454

5555
PACKAGE_VERSION = @VERSION@
5656

src/iconv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ static void print_version (void)
191191
{
192192
printf("iconv (GNU libiconv %d.%d)\n",
193193
_libiconv_version >> 8, _libiconv_version & 0xff);
194-
printf("Copyright (C) %s Free Software Foundation, Inc.\n", "2000-2009");
194+
printf("Copyright (C) %s Free Software Foundation, Inc.\n", "2000-2011");
195195
/* xgettext: no-wrap */
196196
fputs (_("\
197197
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\

windows/iconv.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BEGIN
2424
VALUE "FileDescription", "GPLed iconv for Windows NT/2000/XP/Vista/7\0"
2525
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
2626
VALUE "InternalName", "iconv.exe\0"
27-
VALUE "LegalCopyright", "Copyright (C) 1999-2009\0"
27+
VALUE "LegalCopyright", "Copyright (C) 1999-2011\0"
2828
VALUE "LegalTrademarks", "\0"
2929
VALUE "OriginalFilename", "iconv.exe\0"
3030
VALUE "ProductName", "iconv: character set conversion program\0"

0 commit comments

Comments
 (0)