Revert "Stamp HEAD as 1.0devel."

This reverts commit d2e24691a95e5cbda8fe60b9c992c4808ba73adf.

8 files changed, 46 insertions, 46 deletions

diff --git a/configure b/configure
index c2b6f958f4..abba43d594 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for Postgres-XC 1.0devel.
+# Generated by GNU Autoconf 2.63 for PostgreSQL 9.1beta2.
 #
-# Report bugs to <postgres-xc-bugs@lists.sourceforge.net>.
+# Report bugs to <pgsql-bugs@postgresql.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -597,11 +597,11 @@ MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME='Postgres-XC'
-PACKAGE_TARNAME='postgres-xc'
-PACKAGE_VERSION='1.0devel'
-PACKAGE_STRING='Postgres-XC 1.0devel'
-PACKAGE_BUGREPORT='postgres-xc-bugs@lists.sourceforge.net'
+PACKAGE_NAME='PostgreSQL'
+PACKAGE_TARNAME='postgresql'
+PACKAGE_VERSION='9.1beta2'
+PACKAGE_STRING='PostgreSQL 9.1beta2'
+PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
 ac_default_prefix=/usr/local/pgsql
@@ -1416,7 +1416,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 Postgres-XC 1.0devel to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.1beta2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1481,7 +1481,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Postgres-XC 1.0devel:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.1beta2:";;
    esac
   cat <<\_ACEOF
 
@@ -1565,7 +1565,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <postgres-xc-bugs@lists.sourceforge.net>.
+Report bugs to <pgsql-bugs@postgresql.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1628,7 +1628,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Postgres-XC configure 1.0devel
+PostgreSQL configure 9.1beta2
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1644,7 +1644,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 Postgres-XC $as_me 1.0devel, which was
+It was created by PostgreSQL $as_me 9.1beta2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2221,22 +2221,22 @@ esac
   if test x"$template" = x"" ; then
     { { $as_echo "$as_me:$LINENO: error:
 *******************************************************************
-Postgres-XC has apparently not been ported to your platform yet.
+PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
 for a similar platform and use the '--with-template=' option.
 
-Please also contact <postgres-xc-bugs@lists.sourceforge.net> to see about
+Please also contact <pgsql-bugs@postgresql.org> to see about
 rectifying this.  Include the above 'checking host system type...'
 line.
 *******************************************************************
 " >&5
 $as_echo "$as_me: error:
 *******************************************************************
-Postgres-XC has apparently not been ported to your platform yet.
+PostgreSQL has apparently not been ported to your platform yet.
 To try a manual configuration, look into the src/template directory
 for a similar platform and use the '--with-template=' option.
 
-Please also contact <postgres-xc-bugs@lists.sourceforge.net> to see about
+Please also contact <pgsql-bugs@postgresql.org> to see about
 rectifying this.  Include the above 'checking host system type...'
 line.
 *******************************************************************
@@ -10111,9 +10111,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## -------------------------------------------------- ##
-## Report this postgres-xc-bugs@lists.sourceforge.net ##
-## -------------------------------------------------- ##
+## ---------------------------------------- ##
+## Report this to pgsql-bugs@postgresql.org ##
+## ---------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -10553,9 +10553,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
-## ----------------------------------------------------- ##
-## Report this to postgres-xc-bugs@lists.sourceforge.net ##
-## ----------------------------------------------------- ##
+## ---------------------------------------- ##
+## Report this to pgsql-bugs@postgresql.org ##
+## ---------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -29582,7 +29582,7 @@ fi
 
 
 cat >>confdefs.h <<_ACEOF
-#define PG_VERSION_STR "Postgres-XC $PACKAGE_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"
+#define PG_VERSION_STR "PostgreSQL $PACKAGE_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"
 _ACEOF
 
 
@@ -30124,7 +30124,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-Postgres-XC config.status 1.0devel
+PostgreSQL config.status 9.1beta2
 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 c653027949..e6232afeaa 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([Postgres-XC], [1.0devel], [postgres-xc-bugs@lists.sourceforge.net])
+AC_INIT([PostgreSQL], [9.1beta2], [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-xc/src/sgml/Makefile b/doc-xc/src/sgml/Makefile
index 76d246e7be..9f840475c2 100644
--- a/doc-xc/src/sgml/Makefile
+++ b/doc-xc/src/sgml/Makefile
@@ -48,7 +48,7 @@ ifndef XSLTPROC
 XSLTPROC = xsltproc
 endif
 
-VERSION = 1.0devel
+VERSION = 0.9.7devel
 
 override XSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'
 
diff --git a/doc-xc/src/sgml/version.sgmlin b/doc-xc/src/sgml/version.sgmlin
index 3b03c8ebb1..e17037c9f8 100644
--- a/doc-xc/src/sgml/version.sgmlin
+++ b/doc-xc/src/sgml/version.sgmlin
@@ -1,2 +1,2 @@
-<!entity version "1.0devel">
-<!entity majorversion "1.0">
+<!entity version "0.9.7devel">
+<!entity majorversion "0.9">
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 585f64cd8e..ba860ee6d2 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -563,25 +563,25 @@
 #define MEMSET_LOOP_LIMIT 1024
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "postgres-xc-developers@lists.sourceforge.net"
+#define PACKAGE_BUGREPORT "pgsql-bugs@postgresql.org"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME "Postgres-XC"
+#define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Postgres-XC 1.0devel"
+#define PACKAGE_STRING "PostgreSQL 9.1beta2"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0devel"
+#define PACKAGE_VERSION "9.1beta2"
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "1.0devel"
+#define PG_VERSION "9.1beta2"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 10000
+#define PG_VERSION_NUM 90100
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "postgres-xc"
+#define PACKAGE_TARNAME "postgresql"
 
 /* Define to the name of the default PostgreSQL service principal in Kerberos.
    (--with-krb-srvnam=NAME) */
diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in
index fff85bb351..adf00b1a28 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 1,0,0,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION 9,1,0,0
+ PRODUCTVERSION 9,1,0,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -14,14 +14,14 @@ BEGIN
         BLOCK "040904B0"
         BEGIN
             VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "Postgres-XC Access Library\0"
-            VALUE "FileVersion", "1.0.0\0"
+            VALUE "FileDescription", "PostgreSQL Access Library\0"
+            VALUE "FileVersion", "9.1.0\0"
             VALUE "InternalName", "libpq\0"
-            VALUE "LegalCopyright", "Copyright (C) 2012\0"
+            VALUE "LegalCopyright", "Copyright (C) 2011\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
-            VALUE "ProductName", "Postgres-XC\0"
-            VALUE "ProductVersion", "1.0.0\0"
+            VALUE "ProductName", "PostgreSQL\0"
+            VALUE "ProductVersion", "9.1.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 9b902e5490..a6fddc38bc 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
 #include "pg_config.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    1,0,0,0
- PRODUCTVERSION 1,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 29f51b1c3c..ef945da2dd 100755
--- a/src/tools/version_stamp.pl
+++ b/src/tools/version_stamp.pl
@@ -22,8 +22,8 @@
 
 # Major version is hard-wired into the script.  We update it when we branch
 # a new development version.
-$major1 = 1;
-$major2 = 0;
+$major1 = 9;
+$major2 = 1;
 
 # Validate argument and compute derived variables
 $minor = shift;