From e6a8de2854bc94fc59b18c3643fd1d08ebfe268f Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 7 Oct 2013 23:10:18 -0400 Subject: [PATCH] Stamp 8.4.18. --- configure | 18 +++++++++--------- configure.in | 2 +- 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, 21 insertions(+), 21 deletions(-) diff --git a/configure b/configure index a83b920cd7..e256cdbc91 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.61 for PostgreSQL 8.4.17. +# Generated by GNU Autoconf 2.61 for PostgreSQL 8.4.18. # # Report bugs to . # @@ -576,8 +576,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='PostgreSQL' PACKAGE_TARNAME='postgresql' -PACKAGE_VERSION='8.4.17' -PACKAGE_STRING='PostgreSQL 8.4.17' +PACKAGE_VERSION='8.4.18' +PACKAGE_STRING='PostgreSQL 8.4.18' 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.17 to adapt to many kinds of systems. +\`configure' configures PostgreSQL 8.4.18 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.17:";; + short | recursive ) echo "Configuration of PostgreSQL 8.4.18:";; 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.17 +PostgreSQL configure 8.4.18 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.17, which was +It was created by PostgreSQL $as_me 8.4.18, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -27977,7 +27977,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.17, which was +This file was extended by PostgreSQL $as_me 8.4.18, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28034,7 +28034,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -PostgreSQL config.status 8.4.17 +PostgreSQL config.status 8.4.18 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 f331459501..5103af0735 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([PostgreSQL], [8.4.17], [pgsql-bugs@postgresql.org]) +AC_INIT([PostgreSQL], [8.4.18], [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 2b26d33b03..2c2c574989 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 8.4.17): PostgreSQL 8.4.17 + PostgreSQL version (example: PostgreSQL 8.4.18): PostgreSQL 8.4.18 Compiler used (example: gcc 3.3.5) : diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index ec93fafa13..63d851c13b 100644 --- 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.17" +#define PACKAGE_STRING "PostgreSQL 8.4.18" /* Define to the version of this package. */ -#define PACKAGE_VERSION "8.4.17" +#define PACKAGE_VERSION "8.4.18" /* PostgreSQL version as a string */ -#define PG_VERSION "8.4.17" +#define PG_VERSION "8.4.18" /* PostgreSQL version as a number */ -#define PG_VERSION_NUM 80417 +#define PG_VERSION_NUM 80418 /* 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 af073bdea8..bf16d5e882 100644 --- a/src/interfaces/libpq/libpq.rc.in +++ b/src/interfaces/libpq/libpq.rc.in @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 8,4,17,0 - PRODUCTVERSION 8,4,17,0 + FILEVERSION 8,4,18,0 + PRODUCTVERSION 8,4,18,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.17\0" + VALUE "FileVersion", "8.4.18\0" VALUE "InternalName", "libpq\0" VALUE "LegalCopyright", "Copyright (C) 2012\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libpq.dll\0" VALUE "ProductName", "PostgreSQL\0" - VALUE "ProductVersion", "8.4.17\0" + VALUE "ProductVersion", "8.4.18\0" END END BLOCK "VarFileInfo" diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc index 930688a476..8608c7cb5a 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,4,17,0 - PRODUCTVERSION 8,4,17,0 + FILEVERSION 8,4,18,0 + PRODUCTVERSION 8,4,18,0 FILEFLAGSMASK 0x17L FILEFLAGS 0x0L FILEOS VOS_NT_WINDOWS32