From 45b88269a353ad93744772791feb6d01bc7e1e42 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 10 Feb 2020 17:14:51 -0500 Subject: [PATCH] Stamp 12.2. --- configure | 18 +++++++++--------- configure.in | 2 +- src/include/pg_config.h.in | 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 5b11f2ebce..c22d3de89a 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 12.1. +# Generated by GNU Autoconf 2.69 for PostgreSQL 12.2. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='PostgreSQL' PACKAGE_TARNAME='postgresql' -PACKAGE_VERSION='12.1' -PACKAGE_STRING='PostgreSQL 12.1' +PACKAGE_VERSION='12.2' +PACKAGE_STRING='PostgreSQL 12.2' PACKAGE_BUGREPORT='pgsql-bugs@lists.postgresql.org' PACKAGE_URL='' @@ -1436,7 +1436,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 12.1 to adapt to many kinds of systems. +\`configure' configures PostgreSQL 12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1501,7 +1501,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PostgreSQL 12.1:";; + short | recursive ) echo "Configuration of PostgreSQL 12.2:";; esac cat <<\_ACEOF @@ -1667,7 +1667,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PostgreSQL configure 12.1 +PostgreSQL configure 12.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2420,7 +2420,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 12.1, which was +It was created by PostgreSQL $as_me 12.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -19907,7 +19907,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 12.1, which was +This file was extended by PostgreSQL $as_me 12.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19977,7 +19977,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 12.1 +PostgreSQL config.status 12.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 700c26fa73..976f90d45b 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], [12.1], [pgsql-bugs@lists.postgresql.org]) +AC_INIT([PostgreSQL], [12.2], [pgsql-bugs@lists.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/src/include/pg_config.h.in b/src/include/pg_config.h.in index 512213aa32..244886a531 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -513,7 +513,7 @@ /* Define to 1 if you have the `srandom' function. */ #undef HAVE_SRANDOM -/* Define to 1 if you have the `SSL_clear_options' function. */ +/* Define to 1 if you have SSL_clear_options() */ #undef HAVE_SSL_CLEAR_OPTIONS /* Define to 1 if you have the `SSL_get_current_compression' function. */ diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 35a3f89ae4..53eca92939 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -645,10 +645,10 @@ #define PACKAGE_NAME "PostgreSQL" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 12.1" +#define PACKAGE_STRING "PostgreSQL 12.2" /* Define to the version of this package. */ -#define PACKAGE_VERSION "12.1" +#define PACKAGE_VERSION "12.2" /* Define to the name of a signed 128-bit integer type. */ #undef PG_INT128_TYPE @@ -657,10 +657,10 @@ #define PG_INT64_TYPE long long int /* PostgreSQL version as a string */ -#define PG_VERSION "12.1" +#define PG_VERSION "12.2" /* PostgreSQL version as a number */ -#define PG_VERSION_NUM 120001 +#define PG_VERSION_NUM 120002 /* 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 02ab6bab4a..1e923d9bb8 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 12,0,1,0 - PRODUCTVERSION 12,0,1,0 + FILEVERSION 12,0,2,0 + PRODUCTVERSION 12,0,2,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", "12.1\0" + VALUE "FileVersion", "12.2\0" VALUE "InternalName", "libpq\0" VALUE "LegalCopyright", "Copyright (C) 2019\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libpq.dll\0" VALUE "ProductName", "PostgreSQL\0" - VALUE "ProductVersion", "12.1\0" + VALUE "ProductVersion", "12.2\0" END END BLOCK "VarFileInfo" diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc index f5ac104594..462882fd6d 100644 --- a/src/port/win32ver.rc +++ b/src/port/win32ver.rc @@ -2,8 +2,8 @@ #include "pg_config.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 12,0,1,0 - PRODUCTVERSION 12,0,1,0 + FILEVERSION 12,0,2,0 + PRODUCTVERSION 12,0,2,0 FILEFLAGSMASK 0x17L FILEFLAGS 0x0L FILEOS VOS_NT_WINDOWS32