X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=new-version.sh;h=36e46f593508884380468fc7ec966ed3ff6f106c;hb=5e029db4971e37437cfe6147d52d00136dfb8cb5;hp=c771aeb09705d475fcb56cce49468917df5fcf34;hpb=0b15b5f38b94ca1eda2b8b25de939776198c017a;p=platform%2Fupstream%2Ffontconfig.git

diff --git a/new-version.sh b/new-version.sh
index c771aeb..36e46f5 100644
--- a/new-version.sh
+++ b/new-version.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if git-status -a > /dev/null; then
+if [ "x`git status -s -uno`" != "x" ]; then
 	echo 'Uncommited changes in repository' 1>&2
 	exit 1
 fi
@@ -21,7 +21,7 @@ eval `echo $version |
 			   
 # Update the version numbers
 
-sed -i configure.in -e "/^AM_INIT_AUTOMAKE/s/2\.[0-9.]*/$version/"
+sed -i configure.ac -e "/^AC_INIT(/s/2\.[0-9.]*/$version/"
 
 sed -i fontconfig/fontconfig.h \
 	-e "/^#define FC_MAJOR/s/[0-9][0-9]*/$major/" \
@@ -71,8 +71,8 @@ if [ $version != $last ]; then
 	# header
 	#
 	(sed '/^2\.[0-9.]*/,$d' README | 
-		sed -e "s/Version.*/Version $version_note/" \
-		    -e "s/200.*/$date/" | awk '
+		sed -r -e "s/Version.*/Version $version_note/" \
+		    -e "s/[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/$date/" | awk '
 		    /^[ \t]/ {
 				gsub ("^[ \t]*", "");
 				gsub ("[ \t]*$", "");
@@ -92,7 +92,7 @@ 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
@@ -104,15 +104,15 @@ if [ $version != $last ]; then
 	mv README.tmp README
 fi
 
-$test git-commit -m"Bump version to $version" \
-	configure.in \
+$test git commit -m"Bump version to $version" \
+	configure.ac \
 	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