9 files changed, 19 insertions, 21 deletions
diff --git a/Admin/release-steps b/Admin/release-steps
index 2a634ba..f1e0b78 100644
--- 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 4d3bae3..699ef21 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 0x001203
+#define LIBINTL_VERSION 0x001300
 extern int libintl_version;
 
 
diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 624e934..1fd396c 100644
--- 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 bd210c5..84659ea 100644
--- 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 36f63dc..65184f6 100644
--- 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 df5bc69..2c660ed 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 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 5c018e6..12c9dcf 100644
--- 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 de0708f..7584b4f 100755
--- 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 c3f1261..752cde9 100755
--- 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 \