From 2f6cf9192c81c5aeb0074ffeb02e5679da0dfc88 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 19 Feb 2010 18:42:30 +0000 Subject: [PATCH] Revert version stamping in wrong branch --- configure | 18 +++++++++--------- configure.in | 4 ++-- doc/bug.template | 2 +- src/include/pg_config.h.win32 | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 6b40cdbc94..f5a93251fb 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.63 for PostgreSQL 9.0alpha4. +# Generated by GNU Autoconf 2.63 for PostgreSQL 9.0devel. # # Report bugs to . # @@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='PostgreSQL' PACKAGE_TARNAME='postgresql' -PACKAGE_VERSION='9.0alpha4' -PACKAGE_STRING='PostgreSQL 9.0alpha4' +PACKAGE_VERSION='9.0devel' +PACKAGE_STRING='PostgreSQL 9.0devel' PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org' ac_unique_file="src/backend/access/common/heaptuple.c" @@ -1410,7 +1410,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.0alpha4 to adapt to many kinds of systems. +\`configure' configures PostgreSQL 9.0devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PostgreSQL 9.0alpha4:";; + short | recursive ) echo "Configuration of PostgreSQL 9.0devel:";; esac cat <<\_ACEOF @@ -1621,7 +1621,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PostgreSQL configure 9.0alpha4 +PostgreSQL configure 9.0devel generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1637,7 +1637,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.0alpha4, which was +It was created by PostgreSQL $as_me 9.0devel, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -29375,7 +29375,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.0alpha4, which was +This file was extended by PostgreSQL $as_me 9.0devel, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29442,7 +29442,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -PostgreSQL config.status 9.0alpha4 +PostgreSQL config.status 9.0devel 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 bb017e3480..f0ade8f92c 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.624 2010/02/19 16:03:22 petere Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.625 2010/02/19 18:42:30 petere 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.0alpha4], [pgsql-bugs@postgresql.org]) +AC_INIT([PostgreSQL], [9.0devel], [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 04c58db3b4..9cb4f2d53f 100644 --- 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.0alpha4): PostgreSQL 9.0alpha4 + PostgreSQL version (example: PostgreSQL 9.0devel): PostgreSQL 9.0devel Compiler used (example: gcc 3.3.5) : diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 0a32a89b59..b9ebeb55ca 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -560,13 +560,13 @@ #define PACKAGE_NAME "PostgreSQL" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PostgreSQL 9.0alpha4" +#define PACKAGE_STRING "PostgreSQL 9.0devel" /* Define to the version of this package. */ -#define PACKAGE_VERSION "9.0alpha4" +#define PACKAGE_VERSION "9.0devel" /* PostgreSQL version as a string */ -#define PG_VERSION "9.0alpha4" +#define PG_VERSION "9.0devel" /* PostgreSQL version as a number */ #define PG_VERSION_NUM 90000