From cf9e156156290a9011dd17dfa917cebae3bee3fd Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 13 Feb 2008 03:40:38 +0000
Subject: [PATCH] Stamp HEAD as 8.4devel.
---
configure | 18 +++++++++---------
configure.in | 4 ++--
doc/bug.template | 2 +-
src/include/pg_config.h.win32 | 8 ++++----
src/interfaces/libpq/libpq.rc.in | 8 ++++----
src/port/win32ver.rc | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/configure b/configure
index 49a1fcb16e..b0d2be20ef 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for PostgreSQL 8.3.0.
+# Generated by GNU Autoconf 2.59 for PostgreSQL 8.4devel.
#
# Report bugs to <pgsql-bugs@postgresql.org>.
#
@@ -271,8 +271,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='PostgreSQL'
PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='8.3.0'
-PACKAGE_STRING='PostgreSQL 8.3.0'
+PACKAGE_VERSION='8.4devel'
+PACKAGE_STRING='PostgreSQL 8.4devel'
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -791,7 +791,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.3.0 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 8.4devel to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -852,7 +852,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of PostgreSQL 8.3.0:";;
+ short | recursive ) echo "Configuration of PostgreSQL 8.4devel:";;
esac
cat <<\_ACEOF
@@ -1014,7 +1014,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-PostgreSQL configure 8.3.0
+PostgreSQL configure 8.4devel
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1030,7 +1030,7 @@ cat >&5 <<_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.3.0, which was
+It was created by PostgreSQL $as_me 8.4devel, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -25617,7 +25617,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by PostgreSQL $as_me 8.3.0, which was
+This file was extended by PostgreSQL $as_me 8.4devel, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25683,7 +25683,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-PostgreSQL config.status 8.3.0
+PostgreSQL config.status 8.4devel
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index 8ef5c73837..3688b787ab 100644
--- 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.546 2008/02/01 04:16:29 scrappy Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.547 2008/02/13 03:40:38 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.3.0], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [8.4devel], [pgsql-bugs@postgresql.org])
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/doc/bug.template b/doc/bug.template
index 6b6d450c9b..2292ea8001 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -31,7 +31,7 @@ System Configuration:
Operating System (example: Linux 2.4.18) :
- PostgreSQL version (example: PostgreSQL 8.3) : PostgreSQL 8.3
+ PostgreSQL version (example: PostgreSQL 8.4devel) : PostgreSQL 8.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 0808f7b12b..1c7e3cd2d0 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -566,16 +566,16 @@
#define PACKAGE_NAME "PostgreSQL"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 8.3"
+#define PACKAGE_STRING "PostgreSQL 8.4devel"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "8.3"
+#define PACKAGE_VERSION "8.4devel"
/* PostgreSQL version as a string */
-#define PG_VERSION "8.3"
+#define PG_VERSION "8.4devel"
/* PostgreSQL version as a number */
-#define PG_VERSION_NUM 80300
+#define PG_VERSION_NUM 80400
/* 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 482faf410d..ee07f2bb33 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 8,3,0,0
- PRODUCTVERSION 8,3,0,0
+ FILEVERSION 8,4,0,0
+ PRODUCTVERSION 8,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", "8.3.0\0"
+ VALUE "FileVersion", "8.4.0\0"
VALUE "InternalName", "libpq\0"
VALUE "LegalCopyright", "Copyright (C) 2008\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libpq.dll\0"
VALUE "ProductName", "PostgreSQL\0"
- VALUE "ProductVersion", "8.3.0\0"
+ VALUE "ProductVersion", "8.4.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index a2ffbf92d3..5fb7da13e6 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
#include "pg_config.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,3,0,0
- PRODUCTVERSION 8,3,0,0
+ FILEVERSION 8,4,0,0
+ PRODUCTVERSION 8,4,0,0
FILEFLAGSMASK 0x17L
FILEFLAGS 0x0L
FILEOS VOS_NT_WINDOWS32