Allow version to end in allphanumerics when version isn't in XML

diff --git a/cvstools/nextversion b/cvstools/nextversion
index 203e17c1c4976187d00d9e1db84603a5ad71e8d0..12ca470614f27b5e94a6682647cfccc04f614f06 100755 (executable)
--- a/cvstools/nextversion
+++ b/cvstools/nextversion
@@ -17,7 +17,7 @@ close (F);
 
 if (/^(.*name=.VERSION.>)([\.\d]+.*?)\+?(<.*)$/s) {
     # ok
-} elsif (/^(.*?)([\.\d]+)\+?(.*)$/s) {
+} elsif (/^(.*?)([\.\d]+.*?)\+?\s*$/s) {
     # ok
 } else {
     die "Cannot find version in VERSION.\n";
@@ -45,7 +45,7 @@ if ($fvers =~ /^(\d+)\.(\d+)\.(\d+)$/) {
     $minor = $3;
     $minor++;
     $fvers = "$major.$middle.$minor";
-} elsif ($fvers =~ /^(\d+)\.(\d+)$/) {
+} elsif ($fvers =~ /^(\d+)\.(\d+.*)$/) {
     $major = $1;
     $minor = $2;
     $minor++;