Merge branch 'devel-2.2' into devel-2.3

* devel-2.2:
  Correct version check for release candidates
  Fix version check
  Add script to check version format

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --cc Makefile.am
index 21f06ab,34fd055..9436423
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -15,9 -15,9 +15,10 @@@ BUILD_BASH_COMPLETION = $(top_srcdir)/a
  RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
  CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
  CHECK_MAN = $(top_srcdir)/autotools/check-man
+ CHECK_VERSION = $(top_srcdir)/autotools/check-version
  REPLACE_VARS_SED = autotools/replace_vars.sed
  
 +clientdir = $(pkgpythondir)/client
  hypervisordir = $(pkgpythondir)/hypervisor
  httpdir = $(pkgpythondir)/http
  masterddir = $(pkgpythondir)/masterd
@@@ -725,9 -638,10 +727,10 @@@ check-dirs: $(BUILT_SOURCES
  
  check-local: check-dirs
        $(CHECK_PYTHON_CODE) $(check_python_code)
+       $(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
  
  .PHONY: lint
 -lint: ganeti $(BUILT_SOURCES)
 +lint: $(BUILT_SOURCES)
        @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
        $(PYLINT) $(LINT_OPTS) $(lint_python_code)