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 version.sh 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.

mpcommon.c

@@ -18,4 +18,4 @@
 
 #include "version.h"
 
-const char *mplayer_version  = "mplayer2 " VERSION;
+const char *mplayer_version  = "mplayer " VERSION;

mplayer.c

@@ -3818,8 +3818,7 @@ static int select_audio(demuxer_t *demuxer, int audio_id, char **audio_lang)
 
 static void print_version(void)
 {
-    mp_msg(MSGT_CPLAYER, MSGL_INFO,
-           "%s (C) 2000-2012 MPlayer & mplayer2 teams\n", mplayer_version);
+    mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s (C) 2000-2012\n", mplayer_version);
 
     /* Test for CPU capabilities (and corresponding OS support) for optimizing */
     GetCpuCaps(&gCpuCaps);

version.sh

@@ -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)