Fix 3.0 snapshots

diff --git a/mksnapshot.sh b/mksnapshot.sh
index 050e258b4c5022ce1939285583f84fc315a80c16..3d2146a483eab63490b87de610269f17700b8b6f 100755 (executable)
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -30,14 +30,14 @@ if [ ! -f $tmpdir/configure ]; then
 fi
 
 cd $tmpdir
-eval `grep "^ *VERSION=" configure | sed -e 's/-BZR//'`
+eval `grep "^ *VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/-CVS//'`
 eval `grep "^ *PACKAGE=" configure`
 ed -s configure.in <<EOS
-g/${VERSION}-BZR/ s//${VERSION}-${date}/
+g/${VERSION}-[A-Z]*/ s//${VERSION}-${date}/
 w
 EOS
 ed -s configure <<EOS
-g/${VERSION}-BZR/ s//${VERSION}-${date}/
+g/${VERSION}-[A-Z]*/ s//${VERSION}-${date}/
 w
 EOS