[epiphany/mcatanzaro/vcs-tag] Restore original version format

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ba7e53d8595e8a10e0ce44b108859131eb50b7cf
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue Jun 11 09:47:34 2019 -0500

    Restore original version format
    
    This changes our version for Tech Preview builds, from, e.g.:
    
    Web 3.33.2-7b76a6a38
    
    Back to:
    
    Web 3.33.2-7-g7b76a6a38+
    
    which is nicer as it shows the -7- so we can see how many commits we are
    past the last tag, and the + showing whether there are uncommitted
    changes. It also removes the build profile from the version number, so
    we don't show "stable" after the version number in stable releases
    (oops!).

 meson.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index d1a28c185..f77d8bbe9 100644
--- a/meson.build
+++ b/meson.build
@@ -62,12 +62,10 @@ conf.set('EPHY_MAJOR_VERSION', version_array[0].to_int())
 conf.set('EPHY_MINOR_VERSION', version_array[1].to_int())
 conf.set('EPHY_MICRO_VERSION', version_array[2].to_int())
 
-conf.set_quoted('VERSION', '@0@-@VCS_TAG@'.format(meson.project_version()))
+conf.set_quoted('VERSION', '@VCS_TAG@')
 
 config_h = declare_dependency(
   sources: vcs_tag(
-    command: ['git', 'rev-parse', '--short', 'HEAD'],
-    fallback: get_option('profile') != 'default' ? 'devel' : 'stable',
     input: configure_file(
       output: 'config.h.in',
       configuration: conf