diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-06-10 21:36:13 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-06-10 21:36:13 -0400 |
commit | a24c104b9a6e4fef0892b2a0b70f4073378e6544 (patch) | |
tree | 2ac8421d1f09fe8cc2c7acfcfe2f8355cf65463a /src | |
parent | ab76208e3df6841b3770edeece57d0f048392237 (diff) | |
download | postgresql-a24c104b9a6e4fef0892b2a0b70f4073378e6544.tar.gz postgresql-a24c104b9a6e4fef0892b2a0b70f4073378e6544.zip |
Stamp HEAD as 9.5devel.
Let the hacking begin ...
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 e6e3c8d3c2f..38dee90e875 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -551,19 +551,19 @@ #define PACKAGE_NAME "PostgreSQL" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 9.4beta1" +#define PACKAGE_STRING "PostgreSQL 9.5devel" /* Define to the version of this package. */ -#define PACKAGE_VERSION "9.4beta1" +#define PACKAGE_VERSION "9.5devel" /* Define to the name of a signed 64-bit integer type. */ #define PG_INT64_TYPE long long int /* PostgreSQL version as a string */ -#define PG_VERSION "9.4beta1" +#define PG_VERSION "9.5devel" /* PostgreSQL version as a number */ -#define PG_VERSION_NUM 90400 +#define PG_VERSION_NUM 90500 /* 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 c5a76452623..c1a2ec361f6 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 9,4,0,0 - PRODUCTVERSION 9,4,0,0 + FILEVERSION 9,5,0,0 + PRODUCTVERSION 9,5,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", "9.4.0\0" + VALUE "FileVersion", "9.5.0\0" VALUE "InternalName", "libpq\0" VALUE "LegalCopyright", "Copyright (C) 2014\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libpq.dll\0" VALUE "ProductName", "PostgreSQL\0" - VALUE "ProductVersion", "9.4.0\0" + VALUE "ProductVersion", "9.5.0\0" END END BLOCK "VarFileInfo" diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc index 11e54c3af86..7c3c263f51a 100644 --- a/src/port/win32ver.rc +++ b/src/port/win32ver.rc @@ -2,8 +2,8 @@ #include "pg_config.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,4,0,0 - PRODUCTVERSION 9,4,0,0 + FILEVERSION 9,5,0,0 + PRODUCTVERSION 9,5,0,0 FILEFLAGSMASK 0x17L FILEFLAGS 0x0L FILEOS VOS_NT_WINDOWS32 diff --git a/src/tools/git_changelog b/src/tools/git_changelog index fd3efa19b70..acceb8493ef 100755 --- a/src/tools/git_changelog +++ b/src/tools/git_changelog @@ -38,7 +38,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_3_STABLE REL9_2_STABLE REL9_1_STABLE REL9_0_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 REL6_5_PATCHES REL6_4); diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl index 00ab5ffed86..a475d1b0eb4 100755 --- a/src/tools/version_stamp.pl +++ b/src/tools/version_stamp.pl @@ -23,7 +23,7 @@ # Major version is hard-wired into the script. We update it when we branch # a new development version. $major1 = 9; -$major2 = 4; +$major2 = 5; # Validate argument and compute derived variables $minor = shift; |