git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/configure b/configure

index ed1ff0acb98f705b8bf686cc39c4d14d4a05edc4..ee72c3c7f7966b6efc36ba67bf1953bbad3beee9 100755 (executable)

--- a/configure

+++ b/configure

#! /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>.

#

# 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=''

# 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]...

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

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.

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ドル $@

# 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

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 80df1d76510c707009518ef253ecd29d9919b976..42d0a2bf3a582a11e31806bc93ebd68ddbf2b429 100644 (file)

--- a/configure.in

+++ b/configure.in

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 4e29e6e3295d9cdeae0cfab55b9f0f7461ffa769..76ec851aa0ac8463fc3783b155cf5e064d9316c1 100644 (file)

--- a/doc/bug.template

+++ b/doc/bug.template

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 e6e3c8d3c2fbcca50eb832a87a4e22535f941b98..38dee90e875025ca3e9642a60dc4b1892b2481e8 100644 (file)

--- a/src/include/pg_config.h.win32

+++ b/src/include/pg_config.h.win32

#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 c5a76452623b7f4a73e527e03dd2097726ceb43d..c1a2ec361f6655d9a3e3e82db451e16c569c3446 100644 (file)

--- a/src/interfaces/libpq/libpq.rc.in

+++ b/src/interfaces/libpq/libpq.rc.in

#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

BEGIN

VALUE "CompanyName", "0円"

VALUE "FileDescription", "PostgreSQL Access Library0円"

- VALUE "FileVersion", "9.4.00円"

+ VALUE "FileVersion", "9.5.00円"

VALUE "InternalName", "libpq0円"

VALUE "LegalCopyright", "Copyright (C) 20140円"

VALUE "LegalTrademarks", "0円"

VALUE "OriginalFilename", "libpq.dll0円"

VALUE "ProductName", "PostgreSQL0円"

- VALUE "ProductVersion", "9.4.00円"

+ VALUE "ProductVersion", "9.5.00円"

END

END

BLOCK "VarFileInfo"

diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc

index 11e54c3af867d3b3d911823db069cf78c90f8112..7c3c263f51a981dce24300a0e996569858b27d62 100644 (file)

--- a/src/port/win32ver.rc

+++ b/src/port/win32ver.rc

#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 fd3efa19b70406166016aa6735829f9ad26091ee..acceb8493ef90f6f7837bee27f87dcfbe6c86071 100755 (executable)

--- a/src/tools/git_changelog

+++ b/src/tools/git_changelog

# (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 00ab5ffed86002d21862d53ec98b1308b779190f..a475d1b0eb40570f121201c93430f479dc8276bd 100755 (executable)

--- a/src/tools/version_stamp.pl

+++ b/src/tools/version_stamp.pl

# 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;