From 9f14dc393bd441dd9251bea2a5a3ad7f889b03c5 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 14 Aug 2017 18:08:30 -0400 Subject: [PATCH] Stamp HEAD as 11devel. Note that we no longer require any manual adjustments to shared-library minor version numbers, cf commit a3bce17ef. So this should be everything. --- 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 ++-- src/tools/git_changelog | 2 +- src/tools/version_stamp.pl | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 52834e9545..a2f9a256b4 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 10beta3. +# Generated by GNU Autoconf 2.69 for PostgreSQL 11devel. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='PostgreSQL' PACKAGE_TARNAME='postgresql' -PACKAGE_VERSION='10beta3' -PACKAGE_STRING='PostgreSQL 10beta3' +PACKAGE_VERSION='11devel' +PACKAGE_STRING='PostgreSQL 11devel' PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org' PACKAGE_URL='' @@ -1409,7 +1409,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 10beta3 to adapt to many kinds of systems. +\`configure' configures PostgreSQL 11devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PostgreSQL 10beta3:";; + short | recursive ) echo "Configuration of PostgreSQL 11devel:";; esac cat <<\_ACEOF @@ -1633,7 +1633,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PostgreSQL configure 10beta3 +PostgreSQL configure 11devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2344,7 +2344,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 10beta3, which was +It was created by PostgreSQL $as_me 11devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -17334,7 +17334,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 10beta3, which was +This file was extended by PostgreSQL $as_me 11devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17404,7 +17404,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 10beta3 +PostgreSQL config.status 11devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 5c036e7f42..e94fba5235 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], [10beta3], [pgsql-bugs@postgresql.org]) +AC_INIT([PostgreSQL], [11devel], [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 d033e0ae3e..4d767bfd51 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 10beta3): PostgreSQL 10beta3 + PostgreSQL version (example: PostgreSQL 11devel): PostgreSQL 11devel Compiler used (example: gcc 3.3.5) : diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 7f60670fa6..0b4110472e 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -551,10 +551,10 @@ #define PACKAGE_NAME "PostgreSQL" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 10beta3" +#define PACKAGE_STRING "PostgreSQL 11devel" /* Define to the version of this package. */ -#define PACKAGE_VERSION "10beta3" +#define PACKAGE_VERSION "11devel" /* Define to the name of a signed 128-bit integer type. */ #undef PG_INT128_TYPE @@ -563,10 +563,10 @@ #define PG_INT64_TYPE long long int /* PostgreSQL version as a string */ -#define PG_VERSION "10beta3" +#define PG_VERSION "11devel" /* PostgreSQL version as a number */ -#define PG_VERSION_NUM 100000 +#define PG_VERSION_NUM 110000 /* 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 761acd4608..437c45d602 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,0,0 - PRODUCTVERSION 10,0,0,0 + FILEVERSION 11,0,0,0 + PRODUCTVERSION 11,0,0,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.0\0" + VALUE "FileVersion", "11.0\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.0\0" + VALUE "ProductVersion", "11.0\0" END END BLOCK "VarFileInfo" diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc index 4bd0736f47..6cb2e99b92 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,0,0 - PRODUCTVERSION 10,0,0,0 + FILEVERSION 11,0,0,0 + PRODUCTVERSION 11,0,0,0 FILEFLAGSMASK 0x17L FILEFLAGS 0x0L FILEOS VOS_NT_WINDOWS32 diff --git a/src/tools/git_changelog b/src/tools/git_changelog index d4c7b5bf14..a66b64467f 100755 --- a/src/tools/git_changelog +++ b/src/tools/git_changelog @@ -57,7 +57,7 @@ require IPC::Open2; # (We could get this from "git branches", but not worth the trouble.) # NB: master must be first! my @BRANCHES = qw(master - REL9_6_STABLE REL9_5_STABLE + REL_10_STABLE REL9_6_STABLE REL9_5_STABLE REL9_4_STABLE REL9_3_STABLE REL9_2_STABLE REL9_1_STABLE REL9_0_STABLE REL8_4_STABLE REL8_3_STABLE REL8_2_STABLE REL8_1_STABLE REL8_0_STABLE REL7_4_STABLE REL7_3_STABLE REL7_2_STABLE REL7_1_STABLE REL7_0_PATCHES diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl index f973dd950c..90ccf9cbaf 100755 --- a/src/tools/version_stamp.pl +++ b/src/tools/version_stamp.pl @@ -24,7 +24,7 @@ use strict; # Major version is hard-wired into the script. We update it when we branch # a new development version. -my $majorversion = 10; +my $majorversion = 11; # Validate argument and compute derived variables my $minor = shift; -- 2.40.0