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.

diff --git a/configure b/configure
index 52834e95451634f6352c0e4ffa6ca5ae08d75bc5..a2f9a256b4f840476cc91fa1a30d3d29e72189ce 100755 (executable)
--- 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 <pgsql-bugs@postgresql.org>.
 #
@@ -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 5c036e7f4204082eeb976747328b9fdac50b8f6f..e94fba5235cc29636021ae59257ff9e85a1e1fce 100644 (file)
--- 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 d033e0ae3e1501c42e32aa251defea25c2e57b69..4d767bfd516b97284308b4ea623677cdea57f851 100644 (file)
--- 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 7f60670fa6f42f01f25b9488c02c336d635a9085..0b4110472e290d3e5555d8a961e1eac415d1213e 100644 (file)
--- 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 761acd46087b1e5c72866d40ce0b4f0a5f5bf0ec..437c45d6022b687dd994c0f76c60824010492ddd 100644 (file)
--- a/src/interfaces/libpq/libpq.rc.in
+++ b/src/interfaces/libpq/libpq.rc.in
@@ -1,8 +1,8 @@
 #include <winver.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 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 4bd0736f47fdd69902ae83a81c9e4a62fd22d3b2..6cb2e99b92882174a0b3d837030755eef3685e73 100644 (file)
--- 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 d4c7b5bf1461d787ded11984e79acfc9808a1616..a66b64467f7306fe8f04d3ff6a7d08c78da8bd03 100755 (executable)
--- 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 f973dd950c71b069d57ccfd63ad7910ad8bc0bef..90ccf9cbaf4418cb922546287efd837b559f114a 100755 (executable)
--- 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;