Merge branch 'st3' of ssh://anonscm.debian.org/git/pkg-haskell/DHG_packages into st3

p/gitit/debian/changelog

+gitit (0.11.1.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata@debian.org>  Wed, 19 Aug 2015 17:39:04 +0200
+
 gitit (0.10.7-3) unstable; urgency=medium
 
   * Remove bogus dependency on libghc-cgi-*

p/haskell-graphviz/debian/changelog

+haskell-graphviz (2999.17.0.2-3) UNRELEASED; urgency=medium
+
+  * ghc-7.10 compat patch
+
+ -- Joachim Breitner <nomeata@debian.org>  Wed, 19 Aug 2015 17:29:40 +0200
+
 haskell-graphviz (2999.17.0.2-2) unstable; urgency=medium
 
   * Upload to unstable

p/haskell-graphviz/debian/patches/ghc-7.10-compat

+Index: haskell-graphviz/Data/GraphViz/Algorithms.hs
+===================================================================
+--- haskell-graphviz.orig/Data/GraphViz/Algorithms.hs	2015-01-04 14:35:41.000000000 +0100
++++ haskell-graphviz/Data/GraphViz/Algorithms.hs	2015-08-19 17:29:19.418284449 +0200
+@@ -31,6 +31,8 @@
+        , transitiveReductionOptions
+        ) where
+ 
++import Prelude hiding (traverse)
++
+ import Data.GraphViz.Attributes.Complete   (Attributes, defaultAttributeValue)
+ import Data.GraphViz.Attributes.Same
+ import Data.GraphViz.Internal.Util         (bool)

p/haskell-happstack-hsp/debian/changelog

-haskell-happstack-hsp (7.3.5-2) UNRELEASED; urgency=medium
+haskell-happstack-hsp (7.3.6-1) unstable; urgency=medium
 
-  * ghc-7.10 compat patch
+  * New upstream release
 
- -- Joachim Breitner <nomeata@debian.org>  Sun, 16 Aug 2015 10:20:56 +0200
+ -- Joachim Breitner <nomeata@debian.org>  Wed, 19 Aug 2015 07:11:43 +0000
 
 haskell-happstack-hsp (7.3.5-1) unstable; urgency=medium
 

p/haskell-happstack-hsp/debian/patches/ghc-7.10-compat

-Index: haskell-happstack-hsp/happstack-hsp.cabal
-===================================================================
---- haskell-happstack-hsp.orig/happstack-hsp.cabal	2015-05-15 03:41:30.000000000 +0200
-+++ haskell-happstack-hsp/happstack-hsp.cabal	2015-08-16 10:20:49.145453731 +0200
-@@ -32,5 +32,5 @@
-                        hsx2hs           >= 0.13.0 && < 0.14,
-                        mtl              >= 1.1 && < 2.3,
-                        utf8-string      >= 0.3 && < 1.1,
--                       syb              >= 0.3 && < 0.5,
-+                       syb              >= 0.3 && < 0.6,
-                        text             >= 0.10 && < 1.3

p/xmonad-contrib/debian/changelog

+xmonad-contrib (0.11.4-2) UNRELEASED; urgency=medium
+
+  * Depend on old-{locale,time}
+
+ -- Joachim Breitner <nomeata@debian.org>  Wed, 19 Aug 2015 16:51:02 +0200
+
 xmonad-contrib (0.11.4-1) unstable; urgency=medium
 
   * New upstream release

p/xmonad-contrib/debian/control

@@ -20,6 +20,10 @@ Build-Depends: debhelper (>= 9),
  libghc-mtl-dev (>= 1),
  libghc-mtl-dev (<< 3),
  libghc-mtl-prof,
+ libghc-old-locale-dev,
+ libghc-old-locale-prof,
+ libghc-old-time-dev,
+ libghc-old-time-prof,
  libghc-random-dev,
  libghc-random-prof,
  libghc-utf8-string-dev,

p/xmonad/debian/patches/fix-GenerateManpage

-Index: xmonad-0.11/util/GenerateManpage.hs
+Index: xmonad/util/GenerateManpage.hs
 ===================================================================
---- xmonad-0.11.orig/util/GenerateManpage.hs	2013-01-01 02:31:47.000000000 +0100
-+++ xmonad-0.11/util/GenerateManpage.hs	2013-02-17 17:01:53.186736898 +0100
-@@ -26,6 +26,7 @@
+--- xmonad.orig/util/GenerateManpage.hs	2015-08-19 16:35:34.888424481 +0200
++++ xmonad/util/GenerateManpage.hs	2015-08-19 16:36:29.285364470 +0200
+@@ -1,3 +1,4 @@
++{-# LANGUAGE FlexibleContexts #-}
+ -- Unlike the rest of xmonad, this file is copyright under the terms of the
+ -- GPL.
+ 
+@@ -26,6 +27,7 @@
  import Text.Regex.Posix
  import Data.Char
  import Data.List
 +import qualified Data.Set as Set
-
+ 
  import Distribution.PackageDescription.Parse
  import Distribution.Verbosity
-@@ -68,9 +69,9 @@
+@@ -68,9 +70,9 @@
                      `liftM` readFile "./XMonad/Config.hs"
-
+ 
      let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
 -        writeOpts = defaultWriterOptions -- { writerLiterateHaskell = True }
 +        writeOpts = def -- { writerLiterateHaskell = True }
-
+ 
 -    parsed <- readMarkdown defaultParserState { stateLiterateHaskell = True }
-+    parsed <- readMarkdown def { readerExtensions = Set.insert Ext_literate_haskell pandocExtensions }
++    Right parsed <- readMarkdown def { readerExtensions = Set.insert Ext_literate_haskell pandocExtensions }
          . unlines
          . replace "___KEYBINDINGS___" keybindings
          . lines