Skip to content

Commit cf8d65d

Browse files
tglsfdctglsfdc
committed
Stamp HEAD as 9.6devel.
Let the hacking begin ...
1 parent ab93f90 commit cf8d65d

File tree

8 files changed

+23
-22
lines changed

8 files changed

+23
-22
lines changed

‎configure

Lines changed: 9 additions & 9 deletions
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.5alpha1.
3+
# Generated by GNU Autoconf 2.69 for PostgreSQL 9.6devel.
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.5alpha1'
586-
PACKAGE_STRING='PostgreSQL 9.5alpha1'
585+
PACKAGE_VERSION='9.6devel'
586+
PACKAGE_STRING='PostgreSQL 9.6devel'
587587
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
588588
PACKAGE_URL=''
589589

@@ -1394,7 +1394,7 @@ if test "$ac_init_help" = "long"; then
13941394
# Omit some internal or obsolete options to make the list less imposing.
13951395
# This message is too long to be a string in the A/UX 3.1 sh.
13961396
cat <<_ACEOF
1397-
\`configure' configures PostgreSQL 9.5alpha1 to adapt to many kinds of systems.
1397+
\`configure' configures PostgreSQL 9.6devel to adapt to many kinds of systems.
13981398
13991399
Usage: $0 [OPTION]... [VAR=VALUE]...
14001400
@@ -1459,7 +1459,7 @@ fi
14591459

14601460
if test -n "$ac_init_help"; then
14611461
case $ac_init_help in
1462-
short | recursive ) echo "Configuration of PostgreSQL 9.5alpha1:";;
1462+
short | recursive ) echo "Configuration of PostgreSQL 9.6devel:";;
14631463
esac
14641464
cat <<\_ACEOF
14651465
@@ -1609,7 +1609,7 @@ fi
16091609
test -n "$ac_init_help" && exit $ac_status
16101610
if $ac_init_version; then
16111611
cat <<\_ACEOF
1612-
PostgreSQL configure 9.5alpha1
1612+
PostgreSQL configure 9.6devel
16131613
generated by GNU Autoconf 2.69
16141614
16151615
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2320,7 +2320,7 @@ cat >config.log <<_ACEOF
23202320
This file contains any messages produced by compilers while
23212321
running configure, to aid debugging if configure makes a mistake.
23222322
2323-
It was created by PostgreSQL $as_me 9.5alpha1, which was
2323+
It was created by PostgreSQL $as_me 9.6devel, which was
23242324
generated by GNU Autoconf 2.69. Invocation command line was
23252325
23262326
$ $0 $@
@@ -16107,7 +16107,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1610716107
# report actual input values of CONFIG_FILES etc. instead of their
1610816108
# values after options handling.
1610916109
ac_log="
16110-
This file was extended by PostgreSQL $as_me 9.5alpha1, which was
16110+
This file was extended by PostgreSQL $as_me 9.6devel, which was
1611116111
generated by GNU Autoconf 2.69. Invocation command line was
1611216112
1611316113
CONFIG_FILES = $CONFIG_FILES
@@ -16177,7 +16177,7 @@ _ACEOF
1617716177
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1617816178
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1617916179
ac_cs_version="\\
16180-
PostgreSQL config.status 9.5alpha1
16180+
PostgreSQL config.status 9.6devel
1618116181
configured by $0, generated by GNU Autoconf 2.69,
1618216182
with options \\"\$ac_cs_config\\"
1618316183

‎configure.in

Lines changed: 1 addition & 1 deletion
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.5alpha1], [pgsql-bugs@postgresql.org])
20+
AC_INIT([PostgreSQL], [9.6devel], [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

Lines changed: 1 addition & 1 deletion
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.5alpha1): PostgreSQL 9.5alpha1
30+
PostgreSQL version (example: PostgreSQL 9.6devel): PostgreSQL 9.6devel
3131

3232
Compiler used (example: gcc 3.3.5) :
3333

‎src/include/pg_config.h.win32

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,10 +563,10 @@
563563
#define PACKAGE_NAME "PostgreSQL"
564564

565565
/* Define to the full name and version of this package. */
566-
#define PACKAGE_STRING "PostgreSQL 9.5alpha1"
566+
#define PACKAGE_STRING "PostgreSQL 9.6devel"
567567

568568
/* Define to the version of this package. */
569-
#define PACKAGE_VERSION "9.5alpha1"
569+
#define PACKAGE_VERSION "9.6devel"
570570

571571
/* Define to the name of a signed 128-bit integer type. */
572572
#undef PG_INT128_TYPE
@@ -575,10 +575,10 @@
575575
#define PG_INT64_TYPE long long int
576576

577577
/* PostgreSQL version as a string */
578-
#define PG_VERSION "9.5alpha1"
578+
#define PG_VERSION "9.6devel"
579579

580580
/* PostgreSQL version as a number */
581-
#define PG_VERSION_NUM 90500
581+
#define PG_VERSION_NUM 90600
582582

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

‎src/interfaces/libpq/libpq.rc.in

Lines changed: 4 additions & 4 deletions
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,5,0,0
5-
PRODUCTVERSION 9,5,0,0
4+
FILEVERSION 9,6,0,0
5+
PRODUCTVERSION 9,6,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.5.0\0"
18+
VALUE "FileVersion", "9.6.0\0"
1919
VALUE "InternalName", "libpq\0"
2020
VALUE "LegalCopyright", "Copyright (C) 2015\0"
2121
VALUE "LegalTrademarks", "\0"
2222
VALUE "OriginalFilename", "libpq.dll\0"
2323
VALUE "ProductName", "PostgreSQL\0"
24-
VALUE "ProductVersion", "9.5.0\0"
24+
VALUE "ProductVersion", "9.6.0\0"
2525
END
2626
END
2727
BLOCK "VarFileInfo"

‎src/port/win32ver.rc

Lines changed: 2 additions & 2 deletions
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,5,0,0
6-
PRODUCTVERSION 9,5,0,0
5+
FILEVERSION 9,6,0,0
6+
PRODUCTVERSION 9,6,0,0
77
FILEFLAGSMASK 0x17L
88
FILEFLAGS 0x0L
99
FILEOS VOS_NT_WINDOWS32

‎src/tools/git_changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +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_5_STABLE
4142
REL9_4_STABLE REL9_3_STABLE REL9_2_STABLE REL9_1_STABLE REL9_0_STABLE
4243
REL8_4_STABLE REL8_3_STABLE REL8_2_STABLE REL8_1_STABLE REL8_0_STABLE
4344
REL7_4_STABLE REL7_3_STABLE REL7_2_STABLE REL7_1_STABLE REL7_0_PATCHES

‎src/tools/version_stamp.pl

Lines changed: 1 addition & 1 deletion
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 = 5;
26+
$major2 = 6;
2727

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

0 commit comments

Comments
 (0)