From 578219bed56bdd6af9bd59497f0954b6d000484c Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 26 Sep 2007 17:43:57 +0000
Subject: [PATCH] Determine the previous version number in a more reasonable
 fashion.

---
 packaging/release-rsync | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 9538feac..dc892457 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -67,7 +67,7 @@ while (<CVS>) {
 chdir('rsync') or die $!;
 
 my($version, $lastversion);
-open(IN, 'configure.in') or die $!;
+open(IN, '<', 'configure.in') or die $!;
 while (<IN>) {
     if (/^RSYNC_VERSION=(.*)/) {
 	$version = $lastversion = $1;
@@ -76,15 +76,11 @@ while (<IN>) {
 }
 close IN;
 
-if (my($major, $minor, $rel) = $lastversion =~ /(\d+)\.(\d+)\.(\d+)cvs$/) {
-    if (--$rel < 0) {
-	$rel = 9;
-	if (--$minor < 0) {
-	    $minor = 6;
-	    $major--;
-	}
-    }
-    $lastversion = "$major.$minor.$rel";
+if ($lastversion =~ /cvs$/) {
+    open(IN, '<', 'OLDNEWS') or die $!;
+    $_ = <IN>;
+    close IN;
+    ($lastversion) = /(\d+\.\d+\.\d+)/;
 }
 
 $version =~ s/cvs/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e;
-- 
2.34.1