diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-08-14 18:08:30 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-08-14 18:08:30 -0400 |
commit | 9f14dc393bd441dd9251bea2a5a3ad7f889b03c5 (patch) | |
tree | a6c12e71062a854d87266c345463bad89280013b /src | |
parent | 21d304dfedb4f26d0d6587d9ac39b1b5c499bb55 (diff) | |
download | postgresql-9f14dc393bd441dd9251bea2a5a3ad7f889b03c5.tar.gz postgresql-9f14dc393bd441dd9251bea2a5a3ad7f889b03c5.zip |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/include/pg_config.h.win32 | 8 | ||||
-rw-r--r-- | src/interfaces/libpq/libpq.rc.in | 8 | ||||
-rw-r--r-- | src/port/win32ver.rc | 4 | ||||
-rwxr-xr-x | src/tools/git_changelog | 2 | ||||
-rwxr-xr-x | src/tools/version_stamp.pl | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 7f60670fa6f..0b4110472e2 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 761acd46087..437c45d6022 100644 --- 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 4bd0736f47f..6cb2e99b928 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 d4c7b5bf146..a66b64467f7 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 f973dd950c7..90ccf9cbaf4 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; |