Prepare for 0.19.

diff --git a/Admin/release-steps b/Admin/release-steps
index 2a634ba0dda3a3b593814cee89dc10b39c09c234..f1e0b7823b92b9beb0626808b3d1eefd199b01a1 100644 (file)
--- a/Admin/release-steps
+++ b/Admin/release-steps
@@ -10,16 +10,14 @@ Tasks not to forget before release:
   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.
+    gettext-runtime/po/Makefile.in.in
+  if this file has changed since the last release.
 
 - Update the version numbers in
     gettext-runtime/m4/po.m4
     gettext-runtime/po/Makefile.in.in
-    gettext-tools/po/Makefile.in.in
-    gettext-runtime/intl/libgnuintl.h.in
-    gettext-tools/libgettextpo/gettext-po.h.in
+    gettext-runtime/intl/libgnuintl.in.h
+    gettext-tools/libgettextpo/gettext-po.in.h
 
 - Update -version-info arguments in gettext-runtime/intl/Makefile.in
   and in gettext-tools/libgettextpo/Makefile.am.
@@ -46,7 +44,7 @@ Tasks not to forget before release:
     gettext-runtime/NEWS
 
 - Tag the repository (don't push it to the remote repository yet).
-  git tag -m 'gettext 0.19.0 release' v0.19.0
+  git tag -m 'gettext 0.19 release' v0.19
 
 - Iterate:
     ./rerun-autogen
@@ -72,7 +70,7 @@ Tasks not to forget before release:
   cp archive.dir.tar.gz-<last-release-number> archive.dir.tar.gz
   ./add-to-archive /somewhere/gettext-0.xx.yy.tar.gz
   Then update the case statement in autopoint.in.
-- run "update-po.sh" to generate PO files with the built tools
+- run "make maintainer-update-po" to generate PO files with the built tools
 - again: "make dist"
 
 * Upload gettext-0.xx.yy.tar.gz to ftp.gnu.org, according to the

diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index 4d3bae3b63c164bbb3bbda7e2e8218ceedd22ddd..699ef212279219670f52370fe80fd82874dfc123 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 0x001203
+#define LIBINTL_VERSION 0x001300
 extern int libintl_version;
 
 

diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 624e934777b7f3565201fdb41b82344acfa9c002..1fd396c18d62be9e99c2c7a607b04a0d0ad81f6e 100644 (file)
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 25 (gettext-0.18.3)
+# intl.m4 serial 26 (gettext-0.19)
 dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -241,8 +241,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
+  dnl bison-2.7 for %define api.pure.
   dnl bison is only needed for the maintainer (who touches plural.y). But in
   dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
   dnl the rule in general Makefile. Now, some people carelessly touch the
@@ -259,7 +258,7 @@ changequote(<<,>>)dnl
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+      2.[7-9]* | [3-9].*)
 changequote([,])dnl
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;

diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index bd210c53690e245d14676dd10a3f945f086b3ab4..84659ea531bde608c429158b8a1e738dc6224675 100644 (file)
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,4 +1,4 @@
-# po.m4 serial 21 (gettext-0.18.3)
+# po.m4 serial 22 (gettext-0.19)
 dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 36f63dc1f23d2010e5bd77611ac03f43f1419706..65184f65c73835e2164b600bba779f8724e77362 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -8,8 +8,8 @@
 # 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.3
-GETTEXT_MACRO_VERSION = 0.18
+# Origin: gettext-0.19
+GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@

diff --git a/gettext-tools/libgettextpo/gettext-po.in.h b/gettext-tools/libgettextpo/gettext-po.in.h
index df5bc697419664cb9aa98cbfdc467a8fae3526da..2c660ede765fa4f033a242e7b4d5a8379ed15211 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 0x001203
+#define LIBGETTEXTPO_VERSION 0x001300
 extern int libgettextpo_version;
 
 /* ================================= Types ================================= */

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 5c018e64351cc5302beeb01822f045e8a99d7300..12c9dcf7be42e93e04e90728d46c6276b6cc3174 100644 (file)
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -331,7 +331,8 @@ case "$ver" in
   0.15 | \
   0.16 | 0.16.1 | \
   0.17 | \
-  0.18 | 0.18.1 | 0.18.2 | 0.18.3 )
+  0.18 | 0.18.1 | 0.18.2 | 0.18.3 | \
+  0.19 )
     ;;
   *)
     func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in

diff --git a/gettext-tools/tests/autopoint-2 b/gettext-tools/tests/autopoint-2
index de0708f275f4b60fbf19348a4d5a25f71ff3ffee..7584b4fe7fdf36510124353e8c65a9e44aade57b 100755 (executable)
--- a/gettext-tools/tests/autopoint-2
+++ b/gettext-tools/tests/autopoint-2
@@ -3,7 +3,7 @@
 
 # Test the autopoint program, without Automake.
 
-required_gettext_version=0.18.2
+required_gettext_version=0.19
 
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \

diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3
index c3f1261d7864fdddada39522b1561bd2cacaf050..752cde9d6c968046024763ef57b386e28a8504ba 100755 (executable)
--- a/gettext-tools/tests/autopoint-3
+++ b/gettext-tools/tests/autopoint-3
@@ -3,7 +3,7 @@
 
 # Test the autopoint program, with Automake.
 
-required_gettext_version=0.18.3
+required_gettext_version=0.19
 
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \