Prepare for version 1.15.
diff --git a/ChangeLog b/ChangeLog
index 0cf0e94..f361c57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-11-25 Bruno Haible <bruno@clisp.org>
+
+ Prepare for version 1.15.
+ * configure.ac: Bump version number to 1.15.
+ * README: Likewise.
+ * include/iconv.h.in (_LIBICONV_VERSION): Likewise.
+ * windows/iconv.rc: Update.
+ * windows/libiconv.rc: Update.
+ * Makefile.devel: Update comments.
+ * lib/Makefile.in (LIBICONV_VERSION_INFO): Bump to 8:0:6.
+ * src/iconv.c (print_version): Update copyright year.
+
2016-11-23 Bruno Haible <bruno@clisp.org>
Update installation instructions for Windows.
diff --git a/Makefile.devel b/Makefile.devel
index 1a39bb6..dcf3b62 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -33,12 +33,9 @@
# Before making a new release:
# - check that the encoding lists in README and man/iconv_open.3 are up to date,
# - increment the version number in
+# configure.ac
# include/iconv.h.in
# README
-# djgpp/README
-# djgpp/fnchange.lst
-# libcharset/djgpp/README
-# libcharset/djgpp/fnchange.lst
# - update the version info in lib/Makefile.in,
# - do "make -f Makefile.devel".
diff --git a/README b/README
index 3da4d0f..19f8370 100644
--- a/README
+++ b/README
@@ -156,7 +156,7 @@
Download
--------
- http://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz
+ http://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz
Homepage
--------
diff --git a/configure.ac b/configure.ac
index 69a2310..32b9b14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright (C) 1999-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2011, 2016 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
@@ -19,7 +19,7 @@
AC_INIT
AC_CONFIG_SRCDIR([lib/iconv.c])
AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([libiconv], [1.14])
+AM_INIT_AUTOMAKE([libiconv], [1.15])
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 bc98d6f..81737dc 100644
--- a/include/iconv.h.in
+++ b/include/iconv.h.in
@@ -20,7 +20,7 @@
#ifndef _LIBICONV_H
#define _LIBICONV_H
-#define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */
+#define _LIBICONV_VERSION 0x010F /* 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 a243f83..f594b1c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -50,7 +50,7 @@
# Before making a release, change this according to the libtool documentation,
# section "Library interface versions".
-LIBICONV_VERSION_INFO = 7:1:5
+LIBICONV_VERSION_INFO = 8:0:6
PACKAGE_VERSION = @VERSION@
diff --git a/src/iconv.c b/src/iconv.c
index 84d08ed..0684c82 100644
--- a/src/iconv.c
+++ b/src/iconv.c
@@ -191,7 +191,7 @@
{
printf("iconv (GNU libiconv %d.%d)\n",
_libiconv_version >> 8, _libiconv_version & 0xff);
- printf("Copyright (C) %s Free Software Foundation, Inc.\n", "2000-2011");
+ printf("Copyright (C) %s Free Software Foundation, Inc.\n", "2000-2016");
/* 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 37eb003..3c38f03 100644
--- a/windows/iconv.rc
+++ b/windows/iconv.rc
@@ -21,10 +21,10 @@
BEGIN
VALUE "Comments", "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.\0"
VALUE "CompanyName", "Free Software Foundation\0"
- VALUE "FileDescription", "GPLed iconv for Windows NT/2000/XP/Vista/7\0"
+ VALUE "FileDescription", "GPLed iconv for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "iconv.exe\0"
- VALUE "LegalCopyright", "Copyright (C) 1999-2011\0"
+ VALUE "LegalCopyright", "Copyright (C) 1999-2016\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "iconv.exe\0"
VALUE "ProductName", "iconv: character set conversion program\0"
diff --git a/windows/libiconv.rc b/windows/libiconv.rc
index 60ce5e4..2675166 100644
--- a/windows/libiconv.rc
+++ b/windows/libiconv.rc
@@ -21,10 +21,10 @@
BEGIN
VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License. You should have received a copy of the GNU Library General Public License along with this library; if not, see <http://www.gnu.org/licenses/>.\0"
VALUE "CompanyName", "Free Software Foundation\0"
- VALUE "FileDescription", "LGPLed libiconv for Windows NT/2000/XP/Vista/7 and Windows 95/98/ME\0"
+ VALUE "FileDescription", "LGPLed libiconv for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "iconv.dll\0"
- VALUE "LegalCopyright", "Copyright (C) 1999-2009\0"
+ VALUE "LegalCopyright", "Copyright (C) 1999-2016\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "iconv.dll\0"
VALUE "ProductName", "libiconv: character set conversion library\0"
