Prepare for 0.18.1.

diff --git a/Admin/release-steps b/Admin/release-steps
index 8903ef39262b0211d9836e19b883f7410f240bad..625c64f77b01a246248aa1117d16ff03cdda153f 100644 (file)
--- a/Admin/release-steps
+++ b/Admin/release-steps
@@ -13,6 +13,11 @@ Tasks not to forget before release:
   Check that gnulib/lib/{localcharset.h,localcharset.c,config.charset}
   agrees with it, except for copyright header changes.
 
+- Update Origin version in
+    gettext-runtime/po/Makefile.in.in and
+    gettext-tools/po/Makefile.in.in
+  if these files have changed since the last release.
+
 - Update the version numbers in
     gettext-runtime/m4/po.m4
     gettext-runtime/po/Makefile.in.in
@@ -20,11 +25,6 @@ Tasks not to forget before release:
     gettext-runtime/intl/libgnuintl.h.in
     gettext-tools/libgettextpo/gettext-po.h.in
 
-- Update Origin version in
-    gettext-runtime/po/Makefile.in.in and
-    gettext-tools/po/Makefile.in.in
-  if these files have changed since the last release.
-
 - Update -version-info arguments in gettext-runtime/intl/Makefile.in
   and in gettext-tools/libgettextpo/Makefile.am.
   * increment LTV_REVISION,

diff --git a/ChangeLog b/ChangeLog
index fe42f311cc65af248aa5277f65e5534a781de727..4d87738f332e9713608808d7390bdb951bb4af5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+       * version.sh: Bump to 0.18.1.
+       * autogen.sh: Record the gnulib version that is being used.
+
 2010-06-03  Bruno Haible  <bruno@clisp.org>
 
        Deprecate the --with-cvs option.

diff --git a/autogen.sh b/autogen.sh
index ace5e5b7896c9bf02dfe0df834376ebddecd16f5..0c333a9bb7ca5889f95a674aa59eb5ece801548d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,8 +36,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 release was prepared using gnulib commit
-# 190bf61ecbb3727a3dd742498938be9e251f9315 from 2010-05-09.)
+# (The gettext-0.18.1 release was prepared using gnulib commit
+# 74d509383fe30bb5511a978b52e4f8ecae37826b from 2010-06-03.)
 #
 # 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 6560391a2af63a8a96c52000e341b7ab2243c273..26e93ebe57340d7b07a81e223dbe12d552540362 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+       * libgnuintl.h.in (LIBINTL_VERSION): Bump to 0.18.1.
+       * Makefile.in (LTV_CURRENT, LTV_REVISION, LTV_AGE): Bump to 9:1:1.
+
 2010-05-20  Bruno Haible  <bruno@clisp.org>
 
        * gettextP.h (_nl_locale_name): Comment out declaration.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index d547fe05e6a247e498c85bd51d03c59e84a4c739..2e53ccca0df17ebe1f47e61bc7584f860c334039 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -232,7 +232,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=0
+LTV_REVISION=1
 LTV_AGE=1
 
 .SUFFIXES:

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

diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog
index 99d6c30813175c160e494a5e649ff0c919847d75..bb0e3626dc636003e1e90670c0223cad3f4073fc 100644 (file)
--- a/gettext-tools/libgettextpo/ChangeLog
+++ b/gettext-tools/libgettextpo/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+       * gettext-po.h.in (LIBGETTEXTPO_VERSION): Bump version number.
+       * Makefile.am (LTV_CURRENT, LTV_REVISION, LTV_AGE): Bump to 5:1:5.
+
 2010-05-09  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.18 released.

diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index 648f589ca3c1716a61119646f3b23882dc5448ac..6ea1d5b7d898593cb7244dc6334f980810194b6f 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=0
+LTV_REVISION=1
 LTV_AGE=5
 
 # How to build libgettextpo.la.

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

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