From 9dbf76d8e87287786f03b65c94305b3dc126029b Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 22 May 2023 11:19:00 +0300 Subject: [PATCH] Begin v2.47 development. --- doc/resource/git-history.cache | 5 +++++ doc/xml/release.xml | 3 +++ meson.build | 2 +- src/build/configure.ac | 2 +- src/configure | 20 ++++++++++---------- src/version.h | 2 +- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/doc/resource/git-history.cache b/doc/resource/git-history.cache index 058156542..2b01bb233 100644 --- a/doc/resource/git-history.cache +++ b/doc/resource/git-history.cache @@ -1,4 +1,9 @@ [ + { + "commit": "b461f7c6f884dba8056858464d1b571e708dad77", + "date": "2023-05-22 11:13:13 +0300", + "subject": "v2.46: Block Incremental Backup and SFTP Storage" + }, { "commit": "a28b72c62431bcf9df02791219d9d6f5d0e60b54", "date": "2023-05-18 09:32:44 +0300", diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 3905b4fd5..1e9a3ab20 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -14,6 +14,9 @@ + + + diff --git a/meson.build b/meson.build index 7378ebba5..472452c80 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'pgbackrest', ['c'], - version: '2.46', + version: '2.47dev', license: 'MIT', meson_version: '>=0.45', default_options: [ diff --git a/src/build/configure.ac b/src/build/configure.ac index 5a1618a0b..03ef374fa 100644 --- a/src/build/configure.ac +++ b/src/build/configure.ac @@ -1,7 +1,7 @@ # Initialize configuration # ---------------------------------------------------------------------------------------------------------------------------------- AC_PREREQ([2.71]) -AC_INIT([pgBackRest], [2.46]) +AC_INIT([pgBackRest], [2.47dev]) AC_CONFIG_SRCDIR([version.h]) AC_CONFIG_AUX_DIR(build) diff --git a/src/configure b/src/configure index 90d594acc..15d5e1959 100755 --- a/src/configure +++ b/src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for pgBackRest 2.46. +# Generated by GNU Autoconf 2.71 for pgBackRest 2.47dev. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -607,8 +607,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pgBackRest' PACKAGE_TARNAME='pgbackrest' -PACKAGE_VERSION='2.46' -PACKAGE_STRING='pgBackRest 2.46' +PACKAGE_VERSION='2.47dev' +PACKAGE_STRING='pgBackRest 2.47dev' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1272,7 +1272,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 pgBackRest 2.46 to adapt to many kinds of systems. +\`configure' configures pgBackRest 2.47dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pgBackRest 2.46:";; + short | recursive ) echo "Configuration of pgBackRest 2.47dev:";; esac cat <<\_ACEOF @@ -1414,7 +1414,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pgBackRest configure 2.46 +pgBackRest configure 2.47dev generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1570,7 +1570,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 pgBackRest $as_me 2.46, which was +It was created by pgBackRest $as_me 2.47dev, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4930,7 +4930,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 pgBackRest $as_me 2.46, which was +This file was extended by pgBackRest $as_me 2.47dev, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4994,7 +4994,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -pgBackRest config.status 2.46 +pgBackRest config.status 2.47dev configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -5698,4 +5698,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -# Generated from src/build/configure.ac sha1 3c8e146142446b04fb8455821fee2a2221536e7d +# Generated from src/build/configure.ac sha1 0b7e4860bad1c26f677acf41f2c0a4e68e4e131b diff --git a/src/version.h b/src/version.h index ad9535b07..e19fca602 100644 --- a/src/version.h +++ b/src/version.h @@ -33,6 +33,6 @@ will be invalid unless migration functions are written. /*********************************************************************************************************************************** Software version ***********************************************************************************************************************************/ -#define PROJECT_VERSION "2.46" +#define PROJECT_VERSION "2.47dev" #endif