path: root/
diff options
authorwm4 <wm4@nowhere>2012-07-28 23:59:27 +0200
committerwm4 <wm4@nowhere>2012-07-29 00:04:17 +0200
commit46b218ca346478d604061c8989191ad337124a30 (patch)
treefceef2d7899e7ce80d2707c40f7f6759db3658de /
parent806461c5b645068752292cf19c273dae2ebd9e19 (diff)
Change version string
Change the "main" name from "mplayer2" to "mplayer". Note that upstream mplayer2 uses "MPlayer2", and mplayer uses "MPlayer", so it's unambiguous. The script used to put the latest tag into the version script. The intention was to add a new tag on each release, but this hasn't been done in over a year, making the tag absolutely pointless. Remove it. Now "git-SHORTHASH" is used. Remove the string "MPlayer & mplayer2 teams" after the copyright date, because that sounded silly.
Diffstat (limited to '')
1 files changed, 2 insertions, 2 deletions
diff --git a/ b/
index 73905f05fc..3b0c319c83 100755
--- a/
+++ b/
@@ -5,13 +5,13 @@ test "$1" && extra="-$1"
# Extract revision number from file used by daily tarball snapshots
# or from "git describe" output
git_revision=$(cat snapshot_version 2> /dev/null)
-test $git_revision || test ! -d .git || git_revision=`git describe --match "v[0-9]*" --always`
+test $git_revision || test ! -d .git || git_revision=`git rev-parse --short HEAD`
git_revision=$(expr "$git_revision" : v*'\(.*\)')
test $git_revision || git_revision=UNKNOWN
# releases extract the version number from the VERSION file
version=$(cat VERSION 2> /dev/null)
-test $version || version=$git_revision
+test $version || version=git-$git_revision
NEW_REVISION="#define VERSION \"${version}${extra}\""
OLD_REVISION=$(head -n 1 version.h 2> /dev/null)