From: Daiki Ueno <ueno@gnu.org>
Date: Sun, 7 Jul 2013 03:12:24 +0000 (+0900)
Subject: Prepare for 0.18.3.
X-Git-Tag: v0.18.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4531e3439a756652fe2e64ad3eaa47544b4cc21;p=thirdparty%2Fgettext.git

Prepare for 0.18.3.
---

diff --git a/autogen.sh b/autogen.sh
index f346c42b0..a1033b651 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -41,8 +41,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.2 release was prepared using gnulib commit
-# f022473fdaf724d84817c4003120b9a38fbf884b from 2012-12-19.)
+# (The gettext-0.18.3 release was prepared using gnulib commit
+# c96bab3fee48a9df55e7366344f838e1fc785c28 from 2013-07-07.)
 #
 # Usage from a released tarball:             ./autogen.sh --quick --skip-gnulib
 # This does not use a gnulib checkout.
diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index a1991d8ac..4d3bae3b6 100644
--- 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 0x001202
+#define LIBINTL_VERSION 0x001203
 extern int libintl_version;
 
 
diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 68b0cbe7e..959bd0421 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 23 (gettext-0.18.2)
+# intl.m4 serial 23 (gettext-0.18.3)
 dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index b98bfeaa5..1c70b6c1a 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,4 +1,4 @@
-# po.m4 serial 21 (gettext-0.18.2)
+# po.m4 serial 21 (gettext-0.18.3)
 dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 0545d2a76..fabdc76c9 100644
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -8,7 +8,7 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.18.2
+# Origin: gettext-0.18.3
 GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
diff --git a/gettext-tools/libgettextpo/gettext-po.in.h b/gettext-tools/libgettextpo/gettext-po.in.h
index e1e21ad1e..df5bc6974 100644
--- 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 0x001202
+#define LIBGETTEXTPO_VERSION 0x001203
 extern int libgettextpo_version;
 
 /* ================================= Types ================================= */
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 87723ec01..6c03e7584 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -316,7 +316,7 @@ case "$ver" in
   0.15 | \
   0.16 | 0.16.1 | \
   0.17 | \
-  0.18 | 0.18.1 | 0.18.2 )
+  0.18 | 0.18.1 | 0.18.2 | 0.18.3 )
     ;;
   *)
     func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in
diff --git a/gettext-tools/misc/po-mode.el b/gettext-tools/misc/po-mode.el
index dac3d115c..761d8b7e6 100644
--- a/gettext-tools/misc/po-mode.el
+++ b/gettext-tools/misc/po-mode.el
@@ -62,7 +62,7 @@
 
 ;;; Code:
 
-(defconst po-mode-version-string "2.21" "\
+(defconst po-mode-version-string "2.22" "\
 Version number of this version of po-mode.el.")
 
 ;;; Emacs portability matters - part I.
diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index 0545d2a76..fabdc76c9 100644
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/po/Makefile.in.in
@@ -8,7 +8,7 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.18.2
+# Origin: gettext-0.18.3
 GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@
diff --git a/gnulib b/gnulib
index f40e61ea0..c96bab3fe 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit f40e61ea0c4940b027aade7dd48948aa93f133a4
+Subproject commit c96bab3fee48a9df55e7366344f838e1fc785c28
diff --git a/version.sh b/version.sh
index f6a4232ff..63ca629ea 100644
--- a/version.sh
+++ b/version.sh
@@ -1,3 +1,3 @@
 # Version number and release date.
-VERSION_NUMBER=0.18.2
-RELEASE_DATE=2012-12-25      # in "date +%Y-%m-%d" format
+VERSION_NUMBER=0.18.3
+RELEASE_DATE=2013-07-07      # in "date +%Y-%m-%d" format