Updated cabal file

And added setup script.

Signed-off-by: Michal Minar <miminar@redhat.com>

3 files changed, 118 insertions, 67 deletions

diff --git a/LICENSE b/LICENSE
index b2653c0..0cabad9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013,2014 Peter Jones <pjones@pmade.com>
+Copyright (c) 2015, Michal Minar
 
 All rights reserved.
 
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
       disclaimer in the documentation and/or other materials provided
       with the distribution.
 
-    * Neither the name of Peter Jones nor the names of other
+    * Neither the name of Michal Minar nor the names of other
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
index 0000000..9a994af
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/xminad.cabal b/xminad.cabal
index 15c95db..013b799 100644
--- a/xminad.cabal
+++ b/xminad.cabal
@@ -1,67 +1,116 @@
-Name:          xminad
-Version:       0.1
-Author:        Michal Minar <mic.liamg@gmail.com>
-Maintainer:    Michal Minar <mic.liamg@gmail.com>
-License:       BSD3
-License-File:  LICENSE
-Category:      Graphics
-Stability:     experimental
-Build-Type:    Simple
-Cabal-Version: >= 1.8
+-- Initial xminad.cabal generated by cabal init.  For further 
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+-- The name of the package.
+name:                xminad
+
+-- The package version.  See the Haskell package versioning policy (PVP) 
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary:      +-+------- breaking API changes
+--                   | | +----- non-breaking API additions
+--                   | | | +--- code changes with no API change
+version:             0.1.0.0
+
+-- A short (one-line) description of the package.
+synopsis:            Minar's XMonad window manager
+
+-- A longer description of the package.
+-- description:         
+
+-- The license under which the package is released.
+license:             BSD3
+
+-- The file containing the license text.
+license-file:        LICENSE
+
+-- The package author(s).
+author:              Michal Minar
+
+-- An email address to which users can send suggestions, bug reports, and 
+-- patches.
+maintainer:          mic.liamg@gmail.com
+
+-- A copyright notice.
+-- copyright:           
+
+category:            Graphics
+
+build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or a 
+-- README.
+-- extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+cabal-version:       >=1.10
 
 Library
-    Exposed-Modules: 
-        XMonad.Layout.TopicDir
-        XMonad.Local.Actions
-        XMonad.Local.Config
-        XMonad.Local.GridSelect
-        XMonad.Local.Keys
-        XMonad.Local.Layout
-        XMonad.Local.ManageHook
-        XMonad.Local.NamedScratchpad
-        XMonad.Local.TopicSpace
-        XMonad.Local.Workspaces
-
-    HS-Source-Dirs: src
-    GHC-Options: -Wall -Werror
-
-    Build-Depends:
-         base           >= 4.0  && < 5.0
-       --, X11            >= 1.6  && < 2.0
-       --, bytestring     >= 0.9  && < 0.11
-       -- , cairo          >= 0.13 && < 0.14
-       , containers
-       , directory      >= 1.1  && < 1.3
-       , MissingH       >= 1.0  && < 1.3
-       --, filepath       >= 1.3  && < 1.4
-       , libmpd         >= 0.8  && < 1.0
-       --, parsec         >= 3.1  && < 3.2
-       --, regex-compat   >= 0.90 && < 1.0
-       --, text           >= 0.11 && < 1.3
-       , xmonad         >= 0.11 && < 0.12
-       , xmonad-contrib >= 0.11
-       , xmonad-extras  >= 0.11 && < 0.12
-
-Executable xminad
-    Main-Is: xminad.hs
-    GHC-Options: -Wall -Werror
-    Build-Depends :
-         base           >= 4.0  && < 5.0
-       , dbus           >= 0.10 && < 0.12
-       --, bytestring     >= 0.9  && < 0.11
-       -- , cairo          >= 0.13 && < 0.14
-       , containers
-       --, directory      >= 1.1  && < 1.3
-       --, filepath       >= 1.3  && < 1.4
-       , libmpd         >= 0.8  && < 1.0
-       --, parsec         >= 3.1  && < 3.2
-       , MissingH       >= 1.0  && < 1.3
-       , regex-compat   >= 0.90 && < 1.0
-       , regex-posix    >= 0.90 && < 1.0
-       , text           >= 0.11 && < 1.3
-       , utf8-string    >= 0.3  && < 0.5
-       , X11            >= 1.6  && < 2.0
-       , xminad
-       , xmonad         >= 0.11 && < 0.12
-       , xmonad-contrib >= 0.11
-       , xmonad-extras  >= 0.11 && < 0.12
+  exposed-modules: 
+    XMonad.Layout.TopicDir
+    XMonad.Local.Actions
+    XMonad.Local.Config
+    XMonad.Local.GridSelect
+    XMonad.Local.Keys
+    XMonad.Local.Layout
+    XMonad.Local.ManageHook
+    XMonad.Local.NamedScratchpad
+    XMonad.Local.TopicSpace
+    XMonad.Local.Workspaces
+
+  -- Directories containing source files.
+  hs-source-dirs:      src
+
+  ghc-options:         -Wall -O2
+
+  build-depends:
+      base           >=4.6  && <4.7
+    , containers     >=0.5  && <0.6
+    , directory      >=1.2  && <1.3
+    , libmpd         >=0.9  && <0.10
+    , MissingH       >=1.2  && <1.3
+    , xmonad         >=0.11 && <0.12
+    , xmonad-contrib >=0.11 && <0.12
+    , xmonad-extras  >=0.11 && <0.12
+
+  -- Base language which the package is written in.
+  default-language:    Haskell2010
+
+executable xminad
+  -- .hs or .lhs file containing the Main module.
+  main-is:             xminad.hs
+
+  ghc-options:         -Wall -O2
+  
+  -- Modules included in this executable, other than Main.
+  -- other-modules:       
+  
+  -- LANGUAGE extensions used by modules in this package.
+  other-extensions:
+      DoAndIfThenElse
+    , DeriveDataTypeable
+    , FlexibleInstances
+    , MultiParamTypeClasses
+    , TypeSynonymInstances
+    , PatternGuards
+
+  -- Other library packages from which modules are imported.
+  build-depends:
+      base           >=4.6  && <4.7
+    , containers     >=0.5  && <0.6
+    , dbus           >=0.10 && < 0.12
+    , directory      >=1.2  && <1.3
+    , libmpd         >=0.9  && <0.10
+    , MissingH       >=1.2  && <1.3
+    , regex-compat   >=0.90 && < 1.0
+    , regex-posix    >=0.90 && < 1.0
+    , text           >=0.11 && < 1.3
+    , utf8-string    >=0.3  && < 0.5
+    , X11            >=1.6  && < 2.0
+    , xminad
+    , xmonad         >=0.11 && <0.12
+    , xmonad-contrib >=0.11 && <0.12
+    , xmonad-extras  >=0.11 && <0.12
+  
+  -- Base language which the package is written in.
+  default-language:    Haskell2010