Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a24c104

Browse files
committed
Stamp HEAD as 9.5devel.
Let the hacking begin ...
1 parent ab76208 commit a24c104

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

configure

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.4beta1.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.5devel.
44
#
55
# Report bugs to <pgsql-bugs@postgresql.org>.
66
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
582582
# Identity of this package.
583583
PACKAGE_NAME='PostgreSQL'
584584
PACKAGE_TARNAME='postgresql'
585-
PACKAGE_VERSION='9.4beta1'
586-
PACKAGE_STRING='PostgreSQL 9.4beta1'
585+
PACKAGE_VERSION='9.5devel'
586+
PACKAGE_STRING='PostgreSQL 9.5devel'
587587
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
588588
PACKAGE_URL=''
589589

@@ -1390,7 +1390,7 @@ if test "$ac_init_help" = "long"; then
13901390
# Omit some internal or obsolete options to make the list less imposing.
13911391
# This message is too long to be a string in the A/UX 3.1 sh.
13921392
cat <<_ACEOF
1393-
\`configure' configures PostgreSQL 9.4beta1 to adapt to many kinds of systems.
1393+
\`configure' configures PostgreSQL 9.5devel to adapt to many kinds of systems.
13941394
13951395
Usage: $0 [OPTION]... [VAR=VALUE]...
13961396
@@ -1455,7 +1455,7 @@ fi
14551455

14561456
if test -n "$ac_init_help"; then
14571457
case $ac_init_help in
1458-
short | recursive ) echo "Configuration of PostgreSQL 9.4beta1:";;
1458+
short | recursive ) echo "Configuration of PostgreSQL 9.5devel:";;
14591459
esac
14601460
cat <<\_ACEOF
14611461
@@ -1603,7 +1603,7 @@ fi
16031603
test -n "$ac_init_help" && exit $ac_status
16041604
if $ac_init_version; then
16051605
cat <<\_ACEOF
1606-
PostgreSQL configure 9.4beta1
1606+
PostgreSQL configure 9.5devel
16071607
generated by GNU Autoconf 2.69
16081608
16091609
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2314,7 +2314,7 @@ cat >config.log <<_ACEOF
23142314
This file contains any messages produced by compilers while
23152315
running configure, to aid debugging if configure makes a mistake.
23162316
2317-
It was created by PostgreSQL $as_me 9.4beta1, which was
2317+
It was created by PostgreSQL $as_me 9.5devel, which was
23182318
generated by GNU Autoconf 2.69. Invocation command line was
23192319
23202320
$ $0 $@
@@ -15393,7 +15393,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1539315393
# report actual input values of CONFIG_FILES etc. instead of their
1539415394
# values after options handling.
1539515395
ac_log="
15396-
This file was extended by PostgreSQL $as_me 9.4beta1, which was
15396+
This file was extended by PostgreSQL $as_me 9.5devel, which was
1539715397
generated by GNU Autoconf 2.69. Invocation command line was
1539815398
1539915399
CONFIG_FILES = $CONFIG_FILES
@@ -15463,7 +15463,7 @@ _ACEOF
1546315463
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1546415464
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1546515465
ac_cs_version="\\
15466-
PostgreSQL config.status 9.4beta1
15466+
PostgreSQL config.status 9.5devel
1546715467
configured by $0, generated by GNU Autoconf 2.69,
1546815468
with options \\"\$ac_cs_config\\"
1546915469

configure.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgreSQL], [9.4beta1], [pgsql-bugs@postgresql.org])
20+
AC_INIT([PostgreSQL], [9.5devel], [pgsql-bugs@postgresql.org])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not

doc/bug.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ System Configuration:
2727

2828
Operating System (example: Linux 2.4.18) :
2929

30-
PostgreSQL version (example: PostgreSQL 9.4beta1): PostgreSQL 9.4beta1
30+
PostgreSQL version (example: PostgreSQL 9.5devel): PostgreSQL 9.5devel
3131

3232
Compiler used (example: gcc 3.3.5) :
3333

src/include/pg_config.h.win32

+4-4
Original file line numberDiff line numberDiff line change
@@ -551,19 +551,19 @@
551551
#define PACKAGE_NAME "PostgreSQL"
552552

553553
/* Define to the full name and version of this package. */
554-
#define PACKAGE_STRING "PostgreSQL 9.4beta1"
554+
#define PACKAGE_STRING "PostgreSQL 9.5devel"
555555

556556
/* Define to the version of this package. */
557-
#define PACKAGE_VERSION "9.4beta1"
557+
#define PACKAGE_VERSION "9.5devel"
558558

559559
/* Define to the name of a signed 64-bit integer type. */
560560
#define PG_INT64_TYPE long long int
561561

562562
/* PostgreSQL version as a string */
563-
#define PG_VERSION "9.4beta1"
563+
#define PG_VERSION "9.5devel"
564564

565565
/* PostgreSQL version as a number */
566-
#define PG_VERSION_NUM 90400
566+
#define PG_VERSION_NUM 90500
567567

568568
/* Define to the one symbol short name of this package. */
569569
#define PACKAGE_TARNAME "postgresql"

src/interfaces/libpq/libpq.rc.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winver.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 9,4,0,0
5-
PRODUCTVERSION 9,4,0,0
4+
FILEVERSION 9,5,0,0
5+
PRODUCTVERSION 9,5,0,0
66
FILEFLAGSMASK 0x3fL
77
FILEFLAGS 0
88
FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
1515
BEGIN
1616
VALUE "CompanyName", "\0"
1717
VALUE "FileDescription", "PostgreSQL Access Library\0"
18-
VALUE "FileVersion", "9.4.0\0"
18+
VALUE "FileVersion", "9.5.0\0"
1919
VALUE "InternalName", "libpq\0"
2020
VALUE "LegalCopyright", "Copyright (C) 2014\0"
2121
VALUE "LegalTrademarks", "\0"
2222
VALUE "OriginalFilename", "libpq.dll\0"
2323
VALUE "ProductName", "PostgreSQL\0"
24-
VALUE "ProductVersion", "9.4.0\0"
24+
VALUE "ProductVersion", "9.5.0\0"
2525
END
2626
END
2727
BLOCK "VarFileInfo"

src/port/win32ver.rc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include "pg_config.h"
33

44
VS_VERSION_INFO VERSIONINFO
5-
FILEVERSION 9,4,0,0
6-
PRODUCTVERSION 9,4,0,0
5+
FILEVERSION 9,5,0,0
6+
PRODUCTVERSION 9,5,0,0
77
FILEFLAGSMASK 0x17L
88
FILEFLAGS 0x0L
99
FILEOS VOS_NT_WINDOWS32

src/tools/git_changelog

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require IPC::Open2;
3838
# (We could get this from "git branches", but not worth the trouble.)
3939
# NB: master must be first!
4040
my @BRANCHES = qw(master
41-
REL9_3_STABLE REL9_2_STABLE REL9_1_STABLE REL9_0_STABLE
41+
REL9_4_STABLE REL9_3_STABLE REL9_2_STABLE REL9_1_STABLE REL9_0_STABLE
4242
REL8_4_STABLE REL8_3_STABLE REL8_2_STABLE REL8_1_STABLE REL8_0_STABLE
4343
REL7_4_STABLE REL7_3_STABLE REL7_2_STABLE REL7_1_STABLE REL7_0_PATCHES
4444
REL6_5_PATCHES REL6_4);

src/tools/version_stamp.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# Major version is hard-wired into the script. We update it when we branch
2424
# a new development version.
2525
$major1 = 9;
26-
$major2 = 4;
26+
$major2 = 5;
2727

2828
# Validate argument and compute derived variables
2929
$minor = shift;

0 commit comments

Comments
 (0)