Ensure consistent naming of the tools

This patch makes sure that all references to the name of the software is
ganeti-htools, not simply htools.

diff --git a/.gitignore b/.gitignore
index 65824c5..5e289ea 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/apidoc/
-/.hpc/
-/coverage/
+/apidoc
+/.hpc
+/coverage
 
 *.o
 *.patch
@@ -25,5 +25,5 @@ test
 version
 Version.hs
 
-htools-*.tar.gz
-htools-*.tar.gz.asc
+*.tar.gz
+*.tar.gz.asc

diff --git a/Ganeti/HTools/QC.hs b/Ganeti/HTools/QC.hs
index ccf6a44..58efb34 100644 (file)
--- a/Ganeti/HTools/QC.hs
+++ b/Ganeti/HTools/QC.hs
@@ -1,4 +1,4 @@
-{-| Unittests for htools
+{-| Unittests for ganeti-htools
 
 -}
 

diff --git a/Ganeti/HTools/Version.hs.in b/Ganeti/HTools/Version.hs.in
index df4fd72..3785e91 100644 (file)
--- a/Ganeti/HTools/Version.hs.in
+++ b/Ganeti/HTools/Version.hs.in
@@ -7,4 +7,4 @@ module Ganeti.HTools.Version
 
 -- | The version of the sources.
 version :: String
-version = "(htools) version %ver%"
+version = "(ganeti-htools) version %ver%"

diff --git a/Makefile b/Makefile
index ae50834..0ef37a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ doc: $(DOCS) Ganeti/HTools/Version.hs
                $$file > $(HDDIR)/Ganeti/HTools/`basename $$file .hs`.html ; \
        done
        haddock --odir $(HDDIR) --html --ignore-all-exports \
-               -t htools -p haddock-prologue \
+               -t ganeti-htools -p haddock-prologue \
                --source-module="%{MODULE/.//}.html" \
                --source-entity="%{MODULE/.//}.html#%{NAME}" \
                $(HSRCS)
@@ -53,11 +53,12 @@ Ganeti/HTools/Version.hs: Ganeti/HTools/Version.hs.in version
 
 dist: Ganeti/HTools/Version.hs version doc
        VN=$$(cat version|sed 's/^v//') ; \
-       ANAME="htools-$$VN.tar" ; \
+       PFX="ganeti-htools-$$VN" ; \
+       ANAME="$$PFX.tar" ; \
        rm -f $$ANAME $$ANAME.gz ; \
-       git archive --format=tar --prefix=htools-$$VN/ HEAD > $$ANAME ; \
+       git archive --format=tar --prefix=$$PFX/ HEAD > $$ANAME ; \
        tar -r -f $$ANAME --owner root --group root \
-           --transform="s,^,htools-$$VN/," version apidoc $(DOCS) ; \
+           --transform="s,^,$$PFX/," version apidoc $(DOCS) ; \
        gzip -v9 $$ANAME ; \
        tar tzvf $$ANAME.gz
 

diff --git a/haddock-prologue b/haddock-prologue
index b4bf7f9..5e156d8 100644 (file)
--- a/haddock-prologue
+++ b/haddock-prologue
@@ -1,5 +1,5 @@
-This is the internal documentation for htools, a couple of small tools
-for Ganeti cluster analysis.
+This is the internal documentation for ganeti-htools, a couple of
+small tools for Ganeti cluster analysis.
 
 The "Ganeti.HTools.Cluster" module is the one holding most high-level
 logic, the "Ganeti.HTools.Node" and "Ganeti.HTools.Instance" modules

diff --git a/test.hs b/test.hs
index d88b247..59d6f10 100644 (file)
--- a/test.hs
+++ b/test.hs
@@ -1,4 +1,4 @@
-{-| Unittest runner for htools
+{-| Unittest runner for ganeti-htools
 
 -}