Update git tag magic for new version format, i.e. 2.20 instead of 2.020.

diff --git a/Makefile b/Makefile
index c15d20d..a336fa1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ test-upgrade:
        use_allegro () { li="${ALLEGRO} -q -L" ; ev="-e" ; } ; \
        use_allegromodern () { li="${ALLEGROMODERN} -q -L" ; ev="-e" ; } ; \
        su=test/script-support ; \
-       for tag in 1.37 1.97 1.369 `git tag -l '2.0??'` ; do \
+       for tag in 1.37 1.97 1.369 `git tag -l '2.0??'` `git tag -l '2.??'` ; do \
          use_${lisp} ; \
          lo="(handler-bind ((warning #'muffle-warning)) (load \"tmp/asdf-$${tag}.lisp\"))" ; \
          echo "Testing upgrade from ASDF $${tag}" ; \
@@ -137,7 +137,7 @@ test-all: test-forward-references doc test-all-lisps
 # Note that the debian git at git://git.debian.org/git/pkg-common-lisp/cl-asdf.git is stale,
 # as we currently build directly from upstream at git://common-lisp.net/projects/asdf/asdf.git
 debian-package: mrproper
-       : $${RELEASE:="$$(git tag -l '2.0[0-9][0-9]' | tail -n 1)"} ; \
+       : $${RELEASE:="$$(git tag -l '2.[0-9][0-9]' | tail -n 1)"} ; \
        git-buildpackage --git-debian-branch=release --git-upstream-branch=$$RELEASE --git-tag --git-retag --git-ignore-branch
 
 # Replace SBCL's ASDF with the current one. -- Not recommended now that SBCL has ASDF2.

diff --git a/bin/asdf-version b/bin/asdf-version
index 4e9acfb..ea68aed 100755 (executable)
--- a/bin/asdf-version
+++ b/bin/asdf-version
@@ -3,7 +3,7 @@
 # write the highest tag to standard output
 # exit code is 1 if it cannot be found
 
-tag=`git describe --tags --match '[0-9].[0-9][0-9][0-9]'`
+tag=`git describe --tags --match '[0-9].[0-9][0-9]'`
 if [ "$tag" == "" ]; then
     exit 1
 fi

diff --git a/bin/make-tarball b/bin/make-tarball
index 4ec217e..5afa79f 100755 (executable)
--- a/bin/make-tarball
+++ b/bin/make-tarball
@@ -4,7 +4,7 @@
 # annotated tag
 
 
-tag=`git describe --tags --match '[0-9].[0-9][0-9][0-9]'`
+tag=`git describe --tags --match '[0-9].[0-9][0-9]'`
 if [ "$tag" == "" ]; then
     echo "Unable to find most recent tag, exiting"
     exit 1

diff --git a/debian/README.building b/debian/README.building
index 265dc31..0550f89 100644 (file)
--- a/debian/README.building
+++ b/debian/README.building
@@ -10,7 +10,7 @@ As upstream maintainer, I do all development in master, and sometimes update rel
        git merge master
 
 * Don't forget to renumber the version, if needed
-       ./bin/bump-version.sh 2.0xx
+       ./bin/bump-version.sh 2.xx
 
 * Commit any relevant files, if needed
        git add ...
@@ -18,7 +18,7 @@ As upstream maintainer, I do all development in master, and sometimes update rel
        git commit
 
 * do the releasing:
-       git tag 2.0xx ; make archive-copy ; make website ;
+       git tag 2.xx ; make archive-copy ; make website ;
         make push
 
 * edit debian files, then: