From a24c104b9a6e4fef0892b2a0b70f4073378e6544 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 10 Jun 2014 21:36:13 -0400
Subject: [PATCH] Stamp HEAD as 9.5devel.
Let the hacking begin ...
---
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 ++--
src/tools/git_changelog | 2 +-
src/tools/version_stamp.pl | 2 +-
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/configure b/configure
index ed1ff0acb98..ee72c3c7f79 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.69 for PostgreSQL 9.4beta1.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 9.5devel.
#
# Report bugs to <pgsql-bugs@postgresql.org>.
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='PostgreSQL'
PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='9.4beta1'
-PACKAGE_STRING='PostgreSQL 9.4beta1'
+PACKAGE_VERSION='9.5devel'
+PACKAGE_STRING='PostgreSQL 9.5devel'
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
PACKAGE_URL=''
@@ -1390,7 +1390,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.4beta1 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.5devel to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1455,7 +1455,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of PostgreSQL 9.4beta1:";;
+ short | recursive ) echo "Configuration of PostgreSQL 9.5devel:";;
esac
cat <<\_ACEOF
@@ -1603,7 +1603,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-PostgreSQL configure 9.4beta1
+PostgreSQL configure 9.5devel
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2314,7 +2314,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.4beta1, which was
+It was created by PostgreSQL $as_me 9.5devel, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -15393,7 +15393,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.4beta1, which was
+This file was extended by PostgreSQL $as_me 9.5devel, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15463,7 +15463,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-PostgreSQL config.status 9.4beta1
+PostgreSQL config.status 9.5devel
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index 80df1d76510..42d0a2bf3a5 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], [9.4beta1], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [9.5devel], [pgsql-bugs@postgresql.org])
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/doc/bug.template b/doc/bug.template
index 4e29e6e3295..76ec851aa0a 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.4beta1): PostgreSQL 9.4beta1
+ PostgreSQL version (example: PostgreSQL 9.5devel): PostgreSQL 9.5devel
Compiler used (example: gcc 3.3.5) :
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index e6e3c8d3c2f..38dee90e875 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -551,19 +551,19 @@
#define PACKAGE_NAME "PostgreSQL"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 9.4beta1"
+#define PACKAGE_STRING "PostgreSQL 9.5devel"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "9.4beta1"
+#define PACKAGE_VERSION "9.5devel"
/* Define to the name of a signed 64-bit integer type. */
#define PG_INT64_TYPE long long int
/* PostgreSQL version as a string */
-#define PG_VERSION "9.4beta1"
+#define PG_VERSION "9.5devel"
/* PostgreSQL version as a number */
-#define PG_VERSION_NUM 90400
+#define PG_VERSION_NUM 90500
/* 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 c5a76452623..c1a2ec361f6 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 9,4,0,0
- PRODUCTVERSION 9,4,0,0
+ FILEVERSION 9,5,0,0
+ PRODUCTVERSION 9,5,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.4.0\0"
+ VALUE "FileVersion", "9.5.0\0"
VALUE "InternalName", "libpq\0"
VALUE "LegalCopyright", "Copyright (C) 2014\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libpq.dll\0"
VALUE "ProductName", "PostgreSQL\0"
- VALUE "ProductVersion", "9.4.0\0"
+ VALUE "ProductVersion", "9.5.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 11e54c3af86..7c3c263f51a 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
#include "pg_config.h"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,4,0,0
- PRODUCTVERSION 9,4,0,0
+ FILEVERSION 9,5,0,0
+ PRODUCTVERSION 9,5,0,0
FILEFLAGSMASK 0x17L
FILEFLAGS 0x0L
FILEOS VOS_NT_WINDOWS32
diff --git a/src/tools/git_changelog b/src/tools/git_changelog
index fd3efa19b70..acceb8493ef 100755
--- a/src/tools/git_changelog
+++ b/src/tools/git_changelog
@@ -38,7 +38,7 @@ require IPC::Open2;
# (We could get this from "git branches", but not worth the trouble.)
# NB: master must be first!
my @BRANCHES = qw(master
- REL9_3_STABLE REL9_2_STABLE REL9_1_STABLE REL9_0_STABLE
+ REL9_4_STABLE REL9_3_STABLE REL9_2_STABLE REL9_1_STABLE REL9_0_STABLE
REL8_4_STABLE REL8_3_STABLE REL8_2_STABLE REL8_1_STABLE REL8_0_STABLE
REL7_4_STABLE REL7_3_STABLE REL7_2_STABLE REL7_1_STABLE REL7_0_PATCHES
REL6_5_PATCHES REL6_4);
diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl
index 00ab5ffed86..a475d1b0eb4 100755
--- a/src/tools/version_stamp.pl
+++ b/src/tools/version_stamp.pl
@@ -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 = 4;
+$major2 = 5;
# Validate argument and compute derived variables
$minor = shift;
--
GitLab