The branch, master has been updated via 8695bcc2 Preparing for release of 3.2.3pre1 via 4ae6f708 Need 3.2.3 line in table & tweak to release script. from 14c4656f A couple more NEWS updates.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 8695bcc2b140b2518254234659a03b96f04055fc Author: Wayne Davison <wa...@opencoder.net> Date: Mon Jul 27 17:56:25 2020 -0700 Preparing for release of 3.2.3pre1 commit 4ae6f708b172ae6dc77bc28136987544f00f2449 Author: Wayne Davison <wa...@opencoder.net> Date: Mon Jul 27 17:49:28 2020 -0700 Need 3.2.3 line in table & tweak to release script. ----------------------------------------------------------------------- Summary of changes: NEWS.md | 1 + packaging/lsb/rsync.spec | 12 ++++++------ packaging/release-rsync | 2 +- version.h | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index 49eafefb..099e294e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4241,6 +4241,7 @@ | RELEASE DATE | VER. | DATE OF COMMIT\* | PROTOCOL | |--------------|--------|------------------|-------------| +| ?? Aug 2020 | 3.2.3 | | 31 | | 04 Jul 2020 | 3.2.2 | | 31 | | 22 Jun 2020 | 3.2.1 | | 31 | | 19 Jun 2020 | 3.2.0 | | 31 | diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec index 939e4647..2bcc33c6 100644 --- a/packaging/lsb/rsync.spec +++ b/packaging/lsb/rsync.spec @@ -1,9 +1,9 @@ Summary: A fast, versatile, remote (and local) file-copying tool Name: rsync -Version: 3.2.2 -%define fullversion %{version} -Release: 1 -%define srcdir src +Version: 3.2.3 +%define fullversion %{version}pre1 +Release: 0.1.pre1 +%define srcdir src-previews Group: Applications/Internet License: GPL Source0: https://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-%{fullversion}.tar.gz @@ -79,8 +79,8 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rsync-ssl/certs %changelog -* Sat Jul 04 2020 Wayne Davison <wa...@opencoder.net> -Released 3.2.2. +* Mon Jul 27 2020 Wayne Davison <wa...@opencoder.net> +Released 3.2.3pre1. * Fri Mar 21 2008 Wayne Davison <wa...@opencoder.net> Added installation of /etc/xinetd.d/rsync file and some commented-out diff --git a/packaging/release-rsync b/packaging/release-rsync index 8423fc53..a8d63ec1 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -188,7 +188,7 @@ About to: txt = replace_or_die(x_re, r'%s \1' % cl_today, txt, f"Unable to update ChangeLog header in {fn}") elif fn == 'rsync.h': x_re = re.compile('(#define\s+SUBPROTOCOL_VERSION)\s+(\d+)') - repl = lambda m: m[1] + ' ' + ('0' if not pre or proto_changed else 1 if m[2] == '0' else m[2]) + repl = lambda m: m[1] + ' ' + ('0' if not pre or not proto_changed else '1' if m[2] == '0' else m[2]) txt = replace_or_die(x_re, repl, txt, f"Unable to find SUBPROTOCOL_VERSION define in {fn}") elif fn == 'NEWS.md': efv = re.escape(finalversion) diff --git a/version.h b/version.h index bf4f8a01..e380f568 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define RSYNC_VERSION "3.2.3dev" +#define RSYNC_VERSION "3.2.3pre1" -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs