diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | doc/bug.template | 2 | ||||
| -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 | 1 | ||||
| -rwxr-xr-x | src/tools/version_stamp.pl | 2 |
8 files changed, 23 insertions, 22 deletions
diff --git a/configure b/configure index d8f21563f6d..5462ac4c6bd 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 9.5alpha1. +# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6devel. # # Report bugs to <pgsql-bugs@postgresql.org>. # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='PostgreSQL' PACKAGE_TARNAME='postgresql' -PACKAGE_VERSION='9.5alpha1' -PACKAGE_STRING='PostgreSQL 9.5alpha1' +PACKAGE_VERSION='9.6devel' +PACKAGE_STRING='PostgreSQL 9.6devel' PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org' PACKAGE_URL='' @@ -1394,7 +1394,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 9.5alpha1 to adapt to many kinds of systems. +\`configure' configures PostgreSQL 9.6devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1459,7 +1459,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PostgreSQL 9.5alpha1:";; + short | recursive ) echo "Configuration of PostgreSQL 9.6devel:";; esac cat <<\_ACEOF @@ -1609,7 +1609,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PostgreSQL configure 9.5alpha1 +PostgreSQL configure 9.6devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2320,7 +2320,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 9.5alpha1, which was +It was created by PostgreSQL $as_me 9.6devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -16107,7 +16107,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 9.5alpha1, which was +This file was extended by PostgreSQL $as_me 9.6devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16177,7 +16177,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 9.5alpha1 +PostgreSQL config.status 9.6devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 21ba3a52f9f..005537c747b 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], [9.5alpha1], [pgsql-bugs@postgresql.org]) +AC_INIT([PostgreSQL], [9.6devel], [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 78d7421b0b4..b9d7cc19a97 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 9.5alpha1): PostgreSQL 9.5alpha1 + PostgreSQL version (example: PostgreSQL 9.6devel): PostgreSQL 9.6devel Compiler used (example: gcc 3.3.5) : diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 09c194f34b5..22bbb9158d3 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -563,10 +563,10 @@ #define PACKAGE_NAME "PostgreSQL" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 9.5alpha1" +#define PACKAGE_STRING "PostgreSQL 9.6devel" /* Define to the version of this package. */ -#define PACKAGE_VERSION "9.5alpha1" +#define PACKAGE_VERSION "9.6devel" /* Define to the name of a signed 128-bit integer type. */ #undef PG_INT128_TYPE @@ -575,10 +575,10 @@ #define PG_INT64_TYPE long long int /* PostgreSQL version as a string */ -#define PG_VERSION "9.5alpha1" +#define PG_VERSION "9.6devel" /* PostgreSQL version as a number */ -#define PG_VERSION_NUM 90500 +#define PG_VERSION_NUM 90600 /* 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 ad998320440..ed6248dcfad 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,5,0,0 - PRODUCTVERSION 9,5,0,0 + FILEVERSION 9,6,0,0 + PRODUCTVERSION 9,6,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.5.0\0" + VALUE "FileVersion", "9.6.0\0" VALUE "InternalName", "libpq\0" VALUE "LegalCopyright", "Copyright (C) 2015\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libpq.dll\0" VALUE "ProductName", "PostgreSQL\0" - VALUE "ProductVersion", "9.5.0\0" + VALUE "ProductVersion", "9.6.0\0" END END BLOCK "VarFileInfo" diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc index 6c64052f0f0..e8a04837c17 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,5,0,0 - PRODUCTVERSION 9,5,0,0 + FILEVERSION 9,6,0,0 + PRODUCTVERSION 9,6,0,0 FILEFLAGSMASK 0x17L FILEFLAGS 0x0L FILEOS VOS_NT_WINDOWS32 diff --git a/src/tools/git_changelog b/src/tools/git_changelog index acceb8493ef..d9f0976a334 100755 --- a/src/tools/git_changelog +++ b/src/tools/git_changelog @@ -38,6 +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_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 6be1ac04a69..607649a31a4 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 = 5; +$major2 = 6; # Validate argument and compute derived variables $minor = shift; |