From 0bd8e851857d07508d505089851c11567d2549b8 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 17 Jan 2022 19:25:02 -0800 Subject: [PATCH] Facilitate the next release. --- NEWS.md | 2 -- packaging/release-rsync | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 502d2d6c..a2734d52 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,3 @@ - # NEWS for rsync 3.2.4 (UNRELEASED) ## Changes in this version: @@ -222,7 +221,6 @@ - Use mallinfo2() instead of mallinfo(), when available. - ------------------------------------------------------------------------------ # NEWS for rsync 3.2.3 (6 Aug 2020) diff --git a/packaging/release-rsync b/packaging/release-rsync index 78f1676f..d484628c 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -206,10 +206,10 @@ About to: 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) - x_re = re.compile(r'^<.+>\s+# NEWS for rsync %s \(UNRELEASED\)\s+## Changes in this version:\n' % efv + x_re = re.compile(r'^# NEWS for rsync %s \(UNRELEASED\)\s+## Changes in this version:\n' % efv + r'(\n### PROTOCOL NUMBER:\s+- The protocol number was changed to \d+\.\n)?') rel_day = 'UNRELEASED' if pre else today - repl = (f'\n\n# NEWS for rsync {finalversion} ({rel_day})\n\n' + repl = (f'# NEWS for rsync {finalversion} ({rel_day})\n\n' + '## Changes in this version:\n') if proto_changed: repl += f'\n### PROTOCOL NUMBER:\n\n - The protocol number was changed to {protocol_version}.\n' -- 2.47.2