From 95d2576d023ec2a8b984472191b4e4be4205516e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 10 Feb 2020 17:19:45 -0500 Subject: [PATCH] Stamp 10.12. --- configure | 18 +++++++++--------- configure.in | 2 +- doc/bug.template | 2 +- src/include/pg_config.h.win32 | 8 ++++---- src/interfaces/libpq/libpq.rc.in | 8 ++++---- src/port/win32ver.rc | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 1e8a3f457c9..491759fdbc8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for PostgreSQL 10.11. +# Generated by GNU Autoconf 2.69 for PostgreSQL 10.12. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='PostgreSQL' PACKAGE_TARNAME='postgresql' -PACKAGE_VERSION='10.11' -PACKAGE_STRING='PostgreSQL 10.11' +PACKAGE_VERSION='10.12' +PACKAGE_STRING='PostgreSQL 10.12' PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org' PACKAGE_URL='' @@ -1412,7 +1412,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures PostgreSQL 10.11 to adapt to many kinds of systems. +\`configure' configures PostgreSQL 10.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1477,7 +1477,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PostgreSQL 10.11:";; + short | recursive ) echo "Configuration of PostgreSQL 10.12:";; esac cat <<\_ACEOF @@ -1636,7 +1636,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PostgreSQL configure 10.11 +PostgreSQL configure 10.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2351,7 +2351,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by PostgreSQL $as_me 10.11, which was +It was created by PostgreSQL $as_me 10.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -17692,7 +17692,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by PostgreSQL $as_me 10.11, which was +This file was extended by PostgreSQL $as_me 10.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17762,7 +17762,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -PostgreSQL config.status 10.11 +PostgreSQL config.status 10.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index b1207fc5b6f..97e2c273f31 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details. dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros -AC_INIT([PostgreSQL], [10.11], [pgsql-bugs@postgresql.org]) +AC_INIT([PostgreSQL], [10.12], [pgsql-bugs@postgresql.org]) m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. Untested combinations of 'autoconf' and PostgreSQL versions are not diff --git a/doc/bug.template b/doc/bug.template index fce0d9a4c20..bce7c31c5e4 100644 --- a/doc/bug.template +++ b/doc/bug.template @@ -27,7 +27,7 @@ System Configuration: Operating System (example: Linux 2.4.18) : - PostgreSQL version (example: PostgreSQL 10.11): PostgreSQL 10.11 + PostgreSQL version (example: PostgreSQL 10.12): PostgreSQL 10.12 Compiler used (example: gcc 3.3.5) : diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index f218c3d307e..9b2e1ccbd2d 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -576,10 +576,10 @@ #define PACKAGE_NAME "PostgreSQL" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 10.11" +#define PACKAGE_STRING "PostgreSQL 10.12" /* Define to the version of this package. */ -#define PACKAGE_VERSION "10.11" +#define PACKAGE_VERSION "10.12" /* Define to the name of a signed 128-bit integer type. */ #undef PG_INT128_TYPE @@ -588,10 +588,10 @@ #define PG_INT64_TYPE long long int /* PostgreSQL version as a string */ -#define PG_VERSION "10.11" +#define PG_VERSION "10.12" /* PostgreSQL version as a number */ -#define PG_VERSION_NUM 100011 +#define PG_VERSION_NUM 100012 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "postgresql" diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in index ffb0df157e9..8525399d32f 100644 --- a/src/interfaces/libpq/libpq.rc.in +++ b/src/interfaces/libpq/libpq.rc.in @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 10,0,11,0 - PRODUCTVERSION 10,0,11,0 + FILEVERSION 10,0,12,0 + PRODUCTVERSION 10,0,12,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,13 +15,13 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "PostgreSQL Access Library\0" - VALUE "FileVersion", "10.11\0" + VALUE "FileVersion", "10.12\0" VALUE "InternalName", "libpq\0" VALUE "LegalCopyright", "Copyright (C) 2017\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libpq.dll\0" VALUE "ProductName", "PostgreSQL\0" - VALUE "ProductVersion", "10.11\0" + VALUE "ProductVersion", "10.12\0" END END BLOCK "VarFileInfo" diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc index 69ecac9341f..27a4671a5a4 100644 --- a/src/port/win32ver.rc +++ b/src/port/win32ver.rc @@ -2,8 +2,8 @@ #include "pg_config.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 10,0,11,0 - PRODUCTVERSION 10,0,11,0 + FILEVERSION 10,0,12,0 + PRODUCTVERSION 10,0,12,0 FILEFLAGSMASK 0x17L FILEFLAGS 0x0L FILEOS VOS_NT_WINDOWS32