Prepare for 0.18.2.

diff --git a/ChangeLog b/ChangeLog
index 2cd8457e27e8ec809bb3ad602cf7ea5340fe412e..530812211c823866292346875bec7bc857dc3ff6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-25  Daiki Ueno  <ueno@gnu.org>
+
+       * version.sh: Bump to 0.18.2.
+       * autogen.sh: Record the gnulib version that is being used.
+       * NEWS: Update the release date of 0.18.2.  Reformat "Autoconf
+       macros" change.
+
 2012-12-21  Daiki Ueno  <ueno@gnu.org>
 
        Fix W64 build errors.

diff --git a/NEWS b/NEWS
index 535995096c8a612803023cd481a0ee2354c4d57a..9738e0356ad512495b77db726c9af0a54c80384d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Version 0.18.2 - October 2011
+Version 0.18.2 - December 2012
 
 * xgettext now understands the block comment syntax of Guile 2.0.
 
@@ -14,11 +14,14 @@ Version 0.18.2 - October 2011
   dependencies against installed package size. --with-xz has the highest
   compression rate, followed by --with-git, followed by --with-bzip2.
 
-* The autoconf macros installed by 'gettextize' now require Autoconf
-  version 2.60 or newer.
+* Autoconf macros:
+  - The autoconf macros installed by 'gettextize' now work with the
+    forthcoming Automake 1.14 and require Autoconf version 2.60 or
+    newer.
 
 * Portability:
-  - Building on MacOS X 10.7 is now supported.
+  - Building on MacOS X 10.7, Cygwin 1.7.10, and newer 64-bit mingw is
+    now supported.
 \f
 Version 0.18.1 - June 2010
 

diff --git a/autogen.sh b/autogen.sh
index ee70372feefce55a4a2e5e70e5e5ffb967f77110..33f909d06a3764ff38354103c439e0f31894d3a3 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -37,8 +37,8 @@
 # Usage after a first-time git clone / cvs checkout:   ./autogen.sh
 # Usage after a git clone / cvs update:                ./autogen.sh --quick
 # This uses an up-to-date gnulib checkout.
-# (The gettext-0.18.1 release was prepared using gnulib commit
-# 74d509383fe30bb5511a978b52e4f8ecae37826b from 2010-06-03.)
+# (The gettext-0.18.2 release was prepared using gnulib commit
+# f022473fdaf724d84817c4003120b9a38fbf884b from 2012-12-19.)
 #
 # Usage from a released tarball:             ./autogen.sh --quick --skip-gnulib
 # This does not use a gnulib checkout.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 31d02b35e5934e7df2bdfacde0864ade779fcd05..29ec83e9a22f65ff744fcb57e98f840b6de602a1 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-25  Daiki Ueno  <ueno@gnu.org>
+
+       * libgnuintl.in.h (LIBINTL_VERSION): Bump to 0.18.2.
+       * Makefile.in (LTV_CURRENT, LTV_REVISION, LTV_AGE): Bump to 9:2:1.
+
 2012-12-25  Daiki Ueno  <ueno@gnu.org>
 
        * intl-exports.c (IMP): Check __MINGW32__ as well as _WIN64.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 4b3511525762999b8413599fe124864cbe145f8d..006d3b02a969e9a5a53aaaa14e3d658af0b60c43 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -231,7 +231,7 @@ libintl.la libgnuintl.la: $(OBJECTS) $(OBJECTS_RES_@WOE32@)
 # Maintainers of other packages that include the intl directory must *not*
 # change these values.
 LTV_CURRENT=9
-LTV_REVISION=1
+LTV_REVISION=2
 LTV_AGE=1
 
 .SUFFIXES:

diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index 008f8b9d73c118edd29be71c554209ee930436a4..a1991d8ac3e94c1afca95b34970624a9c0f1276b 100644 (file)
--- a/gettext-runtime/intl/libgnuintl.in.h
+++ b/gettext-runtime/intl/libgnuintl.in.h
@@ -54,7 +54,7 @@ extern "C" {
 
 
 /* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001201
+#define LIBINTL_VERSION 0x001202
 extern int libintl_version;
 
 

diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog
index d4cdbb0b31b965d7a5608db5b1c2dbcce7ae5ad3..e0c7904389c165e900850c905b1b9c872f645ff5 100644 (file)
--- a/gettext-tools/libgettextpo/ChangeLog
+++ b/gettext-tools/libgettextpo/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-08  Daiki Ueno  <ueno@unixuser.org>
+
+       * gettext-po.in.h (LIBGETTEXTPO_VERSION): Bump to 0.18.2.
+       * Makefile.am (LTV_CURRENT): Bump to 5:2:5.
+
 2010-11-07  Bruno Haible  <bruno@clisp.org>
 
        Rename gettext-po.h.in to gettext-po.in.h.

diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index c8fb05dfc4d990022c3df5353530a54e019701c3..cf4a92864bcfcfaed84f1b150c909fdcf24c7bf4 100644 (file)
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -92,7 +92,7 @@ libgettextpo_la_AUXSOURCES = \
 # Libtool's library version information for libgettextpo.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT=5
-LTV_REVISION=1
+LTV_REVISION=2
 LTV_AGE=5
 
 # How to build libgettextpo.la.

diff --git a/gettext-tools/libgettextpo/gettext-po.in.h b/gettext-tools/libgettextpo/gettext-po.in.h
index 24fd8e90ed391bf734973bbeabcb9b4dc2ccc0da..e1e21ad1ea5a09e950380e35b59a736ee39840f6 100644 (file)
--- a/gettext-tools/libgettextpo/gettext-po.in.h
+++ b/gettext-tools/libgettextpo/gettext-po.in.h
@@ -28,7 +28,7 @@ extern "C" {
 /* =========================== Meta Information ============================ */
 
 /* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBGETTEXTPO_VERSION 0x001201
+#define LIBGETTEXTPO_VERSION 0x001202
 extern int libgettextpo_version;
 
 /* ================================= Types ================================= */

diff --git a/version.sh b/version.sh
index 6711ada60e76e31235954095592066049f33ef73..f6a4232ff87574c941dd71ada9c7b043ea34a86e 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -1,3 +1,3 @@
 # Version number and release date.
-VERSION_NUMBER=0.18.1
-RELEASE_DATE=2010-06-04      # in "date +%Y-%m-%d" format
+VERSION_NUMBER=0.18.2
+RELEASE_DATE=2012-12-25      # in "date +%Y-%m-%d" format