mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stamp HEAD as 11devel.

Browse Source 
Note that we no longer require any manual adjustments to shared-library
minor version numbers, cf commit a3bce17ef.  So this should be everything.
This commit is contained in:
Tom Lane 2017-08-14 18:08:30 -04:00
parent 21d304dfed
commit 9f14dc393b
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for PostgreSQL 10beta3. # Generated by GNU Autoconf 2.69 for PostgreSQL 11devel.
# #
# Report bugs to <pgsql-bugs@postgresql.org>. # Report bugs to <pgsql-bugs@postgresql.org>.
# #
@ -582,8 +582,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='PostgreSQL' PACKAGE_NAME='PostgreSQL'
PACKAGE_TARNAME='postgresql' PACKAGE_TARNAME='postgresql'
PACKAGE_VERSION='10beta3' PACKAGE_VERSION='11devel'
PACKAGE_STRING='PostgreSQL 10beta3' PACKAGE_STRING='PostgreSQL 11devel'
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org' PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
PACKAGE_URL='' PACKAGE_URL=''
@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures PostgreSQL 10beta3 to adapt to many kinds of systems. \`configure' configures PostgreSQL 11devel to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1474,7 +1474,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of PostgreSQL 10beta3:";; short | recursive ) echo "Configuration of PostgreSQL 11devel:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1633,7 +1633,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
PostgreSQL configure 10beta3 PostgreSQL configure 11devel
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -2344,7 +2344,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by PostgreSQL $as_me 10beta3, which was It was created by PostgreSQL $as_me 11devel, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -17334,7 +17334,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by PostgreSQL $as_me 10beta3, which was This file was extended by PostgreSQL $as_me 11devel, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -17404,7 +17404,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
PostgreSQL config.status 10beta3 PostgreSQL config.status 11devel
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.in
View File

@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
dnl dnl
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
AC_INIT([PostgreSQL], [10beta3], [pgsql-bugs@postgresql.org]) AC_INIT([PostgreSQL], [11devel], [pgsql-bugs@postgresql.org])
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. 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 Untested combinations of 'autoconf' and PostgreSQL versions are not

2
doc/bug.template
View File

@ -27,7 +27,7 @@ System Configuration:
Operating System (example: Linux 2.4.18) : Operating System (example: Linux 2.4.18) :
PostgreSQL version (example: PostgreSQL 10beta3): PostgreSQL 10beta3 PostgreSQL version (example: PostgreSQL 11devel): PostgreSQL 11devel
Compiler used (example: gcc 3.3.5) : Compiler used (example: gcc 3.3.5) :

8
src/include/pg_config.h.win32
View File

@ -551,10 +551,10 @@
#define PACKAGE_NAME "PostgreSQL" #define PACKAGE_NAME "PostgreSQL"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "PostgreSQL 10beta3" #define PACKAGE_STRING "PostgreSQL 11devel"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "10beta3" #define PACKAGE_VERSION "11devel"
/* Define to the name of a signed 128-bit integer type. */ /* Define to the name of a signed 128-bit integer type. */
#undef PG_INT128_TYPE #undef PG_INT128_TYPE
@ -563,10 +563,10 @@
#define PG_INT64_TYPE long long int #define PG_INT64_TYPE long long int
/* PostgreSQL version as a string */ /* PostgreSQL version as a string */
#define PG_VERSION "10beta3" #define PG_VERSION "11devel"
/* PostgreSQL version as a number */ /* PostgreSQL version as a number */
#define PG_VERSION_NUM 100000 #define PG_VERSION_NUM 110000
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "postgresql" #define PACKAGE_TARNAME "postgresql"

8
src/interfaces/libpq/libpq.rc.in
View File

@ -1,8 +1,8 @@
#include <winver.h> #include <winver.h>
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 10,0,0,0 FILEVERSION 11,0,0,0
PRODUCTVERSION 10,0,0,0 PRODUCTVERSION 11,0,0,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEFLAGS 0 FILEFLAGS 0
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
@ -15,13 +15,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "\0" VALUE "CompanyName", "\0"
VALUE "FileDescription", "PostgreSQL Access Library\0" VALUE "FileDescription", "PostgreSQL Access Library\0"
VALUE "FileVersion", "10.0\0" VALUE "FileVersion", "11.0\0"
VALUE "InternalName", "libpq\0" VALUE "InternalName", "libpq\0"
VALUE "LegalCopyright", "Copyright (C) 2017\0" VALUE "LegalCopyright", "Copyright (C) 2017\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libpq.dll\0" VALUE "OriginalFilename", "libpq.dll\0"
VALUE "ProductName", "PostgreSQL\0" VALUE "ProductName", "PostgreSQL\0"
VALUE "ProductVersion", "10.0\0" VALUE "ProductVersion", "11.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

4
src/port/win32ver.rc
View File

@ -2,8 +2,8 @@
#include "pg_config.h" #include "pg_config.h"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 10,0,0,0 FILEVERSION 11,0,0,0
PRODUCTVERSION 10,0,0,0 PRODUCTVERSION 11,0,0,0
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32

2
src/tools/git_changelog
View File

@ -57,7 +57,7 @@ require IPC::Open2;
# (We could get this from "git branches", but not worth the trouble.) # (We could get this from "git branches", but not worth the trouble.)
# NB: master must be first! # NB: master must be first!
my @BRANCHES = qw(master my @BRANCHES = qw(master
REL9_6_STABLE REL9_5_STABLE REL_10_STABLE REL9_6_STABLE REL9_5_STABLE
REL9_4_STABLE 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 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 REL7_4_STABLE REL7_3_STABLE REL7_2_STABLE REL7_1_STABLE REL7_0_PATCHES

2
src/tools/version_stamp.pl
View File

@ -24,7 +24,7 @@ use strict;
# Major version is hard-wired into the script. We update it when we branch # Major version is hard-wired into the script. We update it when we branch
# a new development version. # a new development version.
my $majorversion = 10; my $majorversion = 11;
# Validate argument and compute derived variables # Validate argument and compute derived variables
my $minor = shift; my $minor = shift;