Bug 44826 - <alias> must contain only a single <family>

[fontconfig.git] / new-version.sh

diff --git a/new-version.sh b/new-version.sh
index bbc855c39bc9157f879f55b9b93a8d569ec58f4c..9ab64dd09f3043c3c326ce39538315016931842c 100644 (file)
--- a/new-version.sh
+++ b/new-version.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if git-status -a > /dev/null; then
+if git status -a > /dev/null; then
        echo 'Uncommited changes in repository' 1>&2
        exit 1
 fi
@@ -70,7 +70,7 @@ if [ $version != $last ]; then
        #
        # header
        #
-       (sed '/^2\.[0-9.]*$/,$d' README | 
+       (sed '/^2\.[0-9.]*/,$d' README | 
                sed -e "s/Version.*/Version $version_note/" \
                    -e "s/200.*/$date/" | awk '
                    /^[ \t]/ {
@@ -92,27 +92,27 @@ if [ $version != $last ]; then
        
        echo $version_note
        echo
-       git-log --pretty=short $last.. | git-shortlog | cat
+       git log --pretty=short $last.. | git shortlog | cat
        
        #
        # previous changelogs
        #
        
-       sed -n '/^2\.[0-9.]*$/,$p' README) > README.tmp ||
+       sed -n '/^2\.[0-9.]*/,$p' README) > README.tmp ||
                (echo "README update failed"; exit 1)
        
        mv README.tmp README
 fi
 
-$test git-commit -m"Bump version to $version" \
+$test git commit -m"Bump version to $version" \
        configure.in \
        fontconfig/fontconfig.h \
        README
 
 # tag the tree
-$test git-tag -u 096c4dd3 -m"Version $version" $version
+$test git tag -s -m "Version $version" $version
 
 # Make distributed change log
 
-git-log --stat $last.. > ChangeLog-$version
+git log --stat $last.. > ChangeLog-$version