Stamp HEAD as 9.4devel.

Let the hacking begin ...

diff --git a/configure b/configure
index 98d889a0e262f3579159e57ff285b82339fa499c..ac3bcbebd2d3b6ffd03fbe0cce272bff6e6cb729 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.63 for PostgreSQL 9.3beta1.
+# Generated by GNU Autoconf 2.63 for PostgreSQL 9.4devel.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='9.3beta1'
-PACKAGE_STRING='PostgreSQL 9.3beta1'
+PACKAGE_VERSION='9.4devel'
+PACKAGE_STRING='PostgreSQL 9.4devel'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1412,7 +1412,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.3beta1 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.4devel to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1477,7 +1477,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 9.3beta1:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.4devel:";;
    esac
   cat <<\_ACEOF
 
@@ -1623,7 +1623,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 9.3beta1
+PostgreSQL configure 9.4devel
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1639,7 +1639,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.3beta1, which was
+It was created by PostgreSQL $as_me 9.4devel, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -30815,7 +30815,7 @@ exec 6>&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.3beta1, which was
+This file was extended by PostgreSQL $as_me 9.4devel, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -30882,7 +30882,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-PostgreSQL config.status 9.3beta1
+PostgreSQL config.status 9.4devel
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index 4ea56996a4b8e43f4b0f624407ba2cc883d1c70c..91c46eeb941bc4afb57f111d93156f530522aa05 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.3beta1], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [9.4devel], [pgsql-bugs@postgresql.org])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/doc/bug.template b/doc/bug.template
index 5a11de75093039495a10d7ba7ff21f221775b27b..081831556d1106c14a81cb449773bf0947bd22c7 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.3beta1):  PostgreSQL 9.3beta1
+  PostgreSQL version (example: PostgreSQL 9.4devel):  PostgreSQL 9.4devel
 
   Compiler used (example: gcc 3.3.5)       :
 

diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index ab84bc21084bb92a62da134547d78ba6c525807f..a4928e5dca1633aa5ce45036801224a170ed72aa 100644 (file)
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -566,19 +566,19 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 9.3beta1"
+#define PACKAGE_STRING "PostgreSQL 9.4devel"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "9.3beta1"
+#define PACKAGE_VERSION "9.4devel"
 
 /* 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.3beta1"
+#define PG_VERSION "9.4devel"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 90300
+#define PG_VERSION_NUM 90400
 
 /* 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 2f64c3ec37e56fd66aae2da70b0ab56ad7d5aab9..0c7bd84dc0892e3ca646e60e3bafbd37347f1a3c 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,3,0,0
- PRODUCTVERSION 9,3,0,0
+ FILEVERSION 9,4,0,0
+ PRODUCTVERSION 9,4,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.3.0\0"
+            VALUE "FileVersion", "9.4.0\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2013\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "9.3.0\0"
+            VALUE "ProductVersion", "9.4.0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 53f43d8c66f1674257139b6ea9b2753b230d1fb8..f28843e9bf83fed69f8ff18ad8edc7d13b4ab0db 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,3,0,0
- PRODUCTVERSION 9,3,0,0
+ FILEVERSION    9,4,0,0
+ PRODUCTVERSION 9,4,0,0
  FILEFLAGSMASK  0x17L
  FILEFLAGS      0x0L
  FILEOS         VOS_NT_WINDOWS32

diff --git a/src/tools/git_changelog b/src/tools/git_changelog
index ac4429e10422136878ee121fa825aae748b5786f..49c34ed8c8eb19f7b216a98c589ee7df720c5866 100755 (executable)
--- 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_2_STABLE REL9_1_STABLE REL9_0_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 71f3ecddc7f3ac5e357702d9a892b90cf9e20d46..5ad28da38cb9303b555d4d1e3f8056ce62cfcbf7 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 = 3;
+$major2 = 4;
 
 # Validate argument and compute derived variables
 $minor = shift;