Stamp HEAD as 9.6devel.

Let the hacking begin ...

diff --git a/configure b/configure
index d8f21563f6de5e19ea7fa1a0b0da8ec1a7e5c975..5462ac4c6bd2047cdc22822c1e822b27654a9676 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 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 21ba3a52f9f3a48ab115e3ca523a6d464dcf1ba6..005537c747be012394598cfcacb10eeb0a125ed5 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], [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 78d7421b0b491628c7cdd748114787170959da15..b9d7cc19a978a7830ddb168f8fb6a2ab428fc97b 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 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 09c194f34b5dfb325e93d2e454c44e33c5a66ce6..22bbb9158d3ccd31c0019e77e4c644e272692a0a 100644 (file)
--- 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 ad998320440a1eab02e3e6e793a066af6657a3e5..ed6248dcfad81418f7a5edc02792763d618d7767 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 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 6c64052f0f00e908d1fd3d05e7d6f76bdc7e1456..e8a04837c1700071fb7e21364084ffd15cdf2cc0 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    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 acceb8493ef90f6f7837bee27f87dcfbe6c86071..d9f0976a334aa985e6ee9380b3f83564a932acd4 100755 (executable)
--- 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 6be1ac04a6986ba56b921730863e3d31f874737f..607649a31a45f0cbe777a3b70fe902b76e95220d 100755 (executable)
--- 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;