Get version from the Paths_xmonad module generated by Cabal

No need to bump version in more than one place.

darcs-hash:20080129144037-6cd96-43776bf811da0f4ab36901be3dfb7981b1261730.gz

2 files changed, 4 insertions, 2 deletions

diff --git a/Main.hs b/Main.hs
index 772577c..0dd6b52 100644
--- a/Main.hs
+++ b/Main.hs
@@ -21,6 +21,9 @@ import System.Info
 import System.Environment
 import System.Posix.Process (executeFile)
 
+import Paths_xmonad (version)
+import Data.Version (showVersion)
+
 #ifdef TESTING
 import qualified Properties
 #endif
@@ -36,7 +39,7 @@ main = do
         ["--resume", _]       -> launch
         ["--recompile"]       -> recompile False >> return ()
         ["--recompile-force"] -> recompile True >> return ()
-        ["--version"]         -> putStrLn "xmonad 0.6"
+        ["--version"]         -> putStrLn ("xmonad " ++ showVersion version)
 #ifdef TESTING
         ("--run-tests":_)     -> Properties.main
 #endif
diff --git a/TODO b/TODO
index 0880e2d..c4bbd48 100644
--- a/TODO
+++ b/TODO
@@ -10,7 +10,6 @@
 
 * configuration documentation
 
-* Be sure to bump --version
 * generate haddocks for core and XMC, upload to xmonad.org
 * generate manpage, generate html manpage
 * double check README build instructions