Stamp HEAD as 9.1devel.

(And there was much rejoicing.)

diff --git a/configure b/configure
index 3c14036723f073f421c3572c642943cb9f2ae066..bd9b347f25ce7cc45ce277d73581af12823bbc3b 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.0beta3.
+# Generated by GNU Autoconf 2.63 for PostgreSQL 9.1devel.
 #
 # Report bugs to <[email protected]>.
 #
@@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='9.0beta3'
-PACKAGE_STRING='PostgreSQL 9.0beta3'
+PACKAGE_VERSION='9.1devel'
+PACKAGE_STRING='PostgreSQL 9.1devel'
 PACKAGE_BUGREPORT='[email protected]'
 
 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.0beta3 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.1devel 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.0beta3:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.1devel:";;
    esac
   cat <<\_ACEOF
 
@@ -1624,7 +1624,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 9.0beta3
+PostgreSQL configure 9.1devel
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1640,7 +1640,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.0beta3, which was
+It was created by PostgreSQL $as_me 9.1devel, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -29532,7 +29532,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.0beta3, which was
+This file was extended by PostgreSQL $as_me 9.1devel, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29599,7 +29599,7 @@ Report bugs to <[email protected]>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-PostgreSQL config.status 9.0beta3
+PostgreSQL config.status 9.1devel
 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 f5270c26b1fe842aebd7624974521d7a5c8260c6..4b2e88d15a41b180487daf3c490ea132b791fad6 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.632 2010/07/09 02:43:12 scrappy Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.633 2010/07/09 04:10:58 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], [9.0beta3], [[email protected]])
+AC_INIT([PostgreSQL], [9.1devel], [[email protected]])
 
 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 d666433bef79b81e3c304d15df6359aacdf8b23e..7204935426047030ddb3c30d0f343fd30263fe05 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.0beta3):  PostgreSQL 9.0beta3
+  PostgreSQL version (example: PostgreSQL 9.1devel):  PostgreSQL 9.1devel
 
   Compiler used (example: gcc 3.3.5)       :
 

diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 73055ba390def4d431c9e70124708dd257360f81..6c342a24d0528bfbde1d390a0e012e8144fff850 100644 (file)
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -560,16 +560,16 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 9.0beta3"
+#define PACKAGE_STRING "PostgreSQL 9.1devel"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "9.0beta3"
+#define PACKAGE_VERSION "9.1devel"
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "9.0beta3"
+#define PG_VERSION "9.1devel"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 90000
+#define PG_VERSION_NUM 90100
 
 /* 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 2e387c9f9b93ffa6b5bcf10137f2c4ac1af66df2..d8bd94d04b0e4d6c19e4a4cec482cb833ec86109 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,0,0,0
- PRODUCTVERSION 9,0,0,0
+ FILEVERSION 9,1,0,0
+ PRODUCTVERSION 9,1,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.0.0\0"
+            VALUE "FileVersion", "9.1.0\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2010\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "9.0.0\0"
+            VALUE "ProductVersion", "9.1.0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 6757dc1ac2a55cbf9795ffcf721f27270fc3095b..633cfc58a8f23c0760406998f1ce92b1a1b52141 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,0,0,0
- PRODUCTVERSION 9,0,0,0
+ FILEVERSION    9,1,0,0
+ PRODUCTVERSION 9,1,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 aff2c289fda4d3cd88e843fd1dffc9ffade66299..3f5d409aa309032a73f56b30081d0ad8b8f1f599 100755 (executable)
--- a/src/tools/version_stamp.pl
+++ b/src/tools/version_stamp.pl
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2008-2010, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.6 2010/02/17 04:19:41 tgl Exp $
+# $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.7 2010/07/09 04:10:58 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 = 9;
-$major2 = 0;
+$major2 = 1;
 
 # Validate argument and compute derived variables
 $minor = shift;