Move Version.hs up from under HTools/

This is another module that is generic, and not htools-specific.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

.gitignore

@@ -121,6 +121,6 @@
 /.hpc/
 /*.tix
 
-/htools/Ganeti/HTools/Version.hs
 /htools/Ganeti/Constants.hs
+/htools/Ganeti/Version.hs
 /htest/Test/Ganeti/TestImports.hs

Makefile.am

@@ -380,7 +380,7 @@ HPCEXCL = --exclude Main \
 	--exclude Ganeti.Constants \
 	--exclude Ganeti.THH \
 	--exclude Ganeti.HTools.QC \
-	--exclude Ganeti.HTools.Version \
+	--exclude Ganeti.Version \
 	--exclude Test.Ganeti.TestCommon \
 	--exclude Test.Ganeti.TestHTools \
 	--exclude Test.Ganeti.TestHelper \
@@ -467,7 +467,7 @@ HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
 HS_BUILT_SRCS = \
 	htest/Test/Ganeti/TestImports.hs \
 	htools/Ganeti/Constants.hs \
-	htools/Ganeti/HTools/Version.hs
+	htools/Ganeti/Version.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
 
 $(RUN_IN_TEMPDIR): | stamp-directories
@@ -1106,7 +1106,7 @@ regen-vcs-version:
 	  $(MAKE) $(AM_MAKEFLAGS) vcs-version; \
 	fi
 
-htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in \
+htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \
 	vcs-version $(built_base_sources)
 	set -e; \
 	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \

htools/Ganeti/Daemon.hs

@@ -68,7 +68,7 @@ import Ganeti.Logging
 import Ganeti.Runtime
 import Ganeti.BasicTypes
 import Ganeti.HTools.Utils
-import qualified Ganeti.HTools.Version as Version(version)
+import qualified Ganeti.Version as Version (version)
 import qualified Ganeti.Constants as C
 import qualified Ganeti.Ssconf as Ssconf
 

htools/Ganeti/HTools/CLI.hs

@@ -94,7 +94,7 @@ import System.Info
 import System.Exit
 import Text.Printf (printf)
 
-import qualified Ganeti.HTools.Version as Version(version)
+import qualified Ganeti.Version as Version (version)
 import qualified Ganeti.HTools.Container as Container
 import qualified Ganeti.HTools.Node as Node
 import qualified Ganeti.Constants as C

htools/Ganeti/HTools/Version.hs.in → htools/Ganeti/Version.hs.in

@@ -2,11 +2,11 @@
 {- | Auto-generated module holding version information.
 -}
 
-module Ganeti.HTools.Version
+module Ganeti.Version
     (
       version
     ) where
 
 -- | The version of the sources.
 version :: String
-version = "(ganeti-htools) version %ver%"
+version = "(ganeti) version %ver%"