Determine the previous version number in a more reasonable fashion.

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 9538feaceaa72db8ebcc27344ea7844b0923d49c..dc892457cfae752180ba097c3a800165ceb20aee 100755 (executable)
--- 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;