Stamp HEAD as 8.5devel.

diff --git a/configure b/configure
index a448d07d736c70dc1b94f406c884704896ac280a..4f5e31a61ed14aaa3ebcb1f23012d2f4f46067cb 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.61 for PostgreSQL 8.4.0.
+# Generated by GNU Autoconf 2.61 for PostgreSQL 8.5devel.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -576,8 +576,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='8.4.0'
-PACKAGE_STRING='PostgreSQL 8.4.0'
+PACKAGE_VERSION='8.5devel'
+PACKAGE_STRING='PostgreSQL 8.5devel'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1289,7 +1289,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 8.4.0 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 8.5devel to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1354,7 +1354,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 8.4.0:";;
+     short | recursive ) echo "Configuration of PostgreSQL 8.5devel:";;
    esac
   cat <<\_ACEOF
 
@@ -1499,7 +1499,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 8.4.0
+PostgreSQL configure 8.5devel
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1515,7 +1515,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 8.4.0, which was
+It was created by PostgreSQL $as_me 8.5devel, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -27806,7 +27806,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 8.4.0, which was
+This file was extended by PostgreSQL $as_me 8.5devel, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27863,7 +27863,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-PostgreSQL config.status 8.4.0
+PostgreSQL config.status 8.5devel
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index 259181eb11d079e7892767e4b3bf4b6cc289e8db..646f61233677428331b3e45fbfc35c5b1c4e0b15 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.602 2009/06/27 00:14:47 scrappy Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.603 2009/07/01 23:15:55 tgl Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [8.5devel], [pgsql-bugs@postgresql.org])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not

diff --git a/doc/bug.template b/doc/bug.template
index ebca416801954a16ff0b4c8aac2f9386cd268bd7..1b65f62c06789c6b3942edd34393e83db2afc68c 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 8.4.0):  PostgreSQL 8.4.0
+  PostgreSQL version (example: PostgreSQL 8.5devel):  PostgreSQL 8.5devel
 
   Compiler used (example: gcc 3.3.5)       :
 

diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 5f05f867a4232f13dbc458551e6f7706d48c5dcb..098bf20bad0d14f45efe426d1cf973ba116bfaf4 100644 (file)
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -563,16 +563,16 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 8.4.0"
+#define PACKAGE_STRING "PostgreSQL 8.5devel"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "8.4.0"
+#define PACKAGE_VERSION "8.5devel"
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "8.4.0"
+#define PG_VERSION "8.5devel"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 80400
+#define PG_VERSION_NUM 80500
 
 /* 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 39ccbea5fc824a49e7f0541d1333f2d690183ddc..c83ef898ff0047a1fb4f9b452c5a7f2c44d62cca 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 8,4,0,0
- PRODUCTVERSION 8,4,0,0
+ FILEVERSION 8,5,0,0
+ PRODUCTVERSION 8,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", "8.4.0\0"
+            VALUE "FileVersion", "8.5.0\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2009\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "8.4.0\0"
+            VALUE "ProductVersion", "8.5.0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 355cf431b009af384288c6636823a8a79a05a551..f11170c8bb6033e10653f702599fc89eb7a6a9a2 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    8,4,0,0
- PRODUCTVERSION 8,4,0,0
+ FILEVERSION    8,5,0,0
+ PRODUCTVERSION 8,5,0,0
  FILEFLAGSMASK  0x17L
  FILEFLAGS      0x0L
  FILEOS         VOS_NT_WINDOWS32

diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl
index d9a5bdb9eea2e6219b0cbbc4207dddb7c3042c15..059665467d2f3f25012a15fb4bc6e3add72068a6 100755 (executable)
--- a/src/tools/version_stamp.pl
+++ b/src/tools/version_stamp.pl
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2008-2009, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.2 2009/01/01 17:24:04 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.3 2009/07/01 23:15:55 tgl Exp $
 #################################################################
 
 #
@@ -23,7 +23,7 @@
 # Major version is hard-wired into the script.  We update it when we branch
 # a new development version.
 $major1 = 8;
-$major2 = 4;
+$major2 = 5;
 
 # Validate argument and compute derived variables
 $minor = shift;