[Pkg-haskell-commits] darcs: gitit: New upstream release

[Joachim Breitner]

Thu May 21 21:49:40 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog -3 +3
    M ./control -2 +5
    R ./patches/comment-type-signature
    R ./patches/series
    R ./patches/

Thu May 21 21:49:40 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-gitit/changelog new-gitit/changelog
--- old-gitit/changelog	2015-05-21 22:07:42.545008363 +0000
+++ new-gitit/changelog	2015-05-21 22:07:42.545008363 +0000
@@ -1,12 +1,12 @@
-gitit (0.10.6.2-1) UNRELEASED; urgency=medium
+gitit (0.10.6.3-1) UNRELEASED; urgency=medium
 
   * Let Homepage point to http://gitit.net/ (Closes: #773367)
   * Depend on haskell-devscripts 0.9, found in experimental
   * Do not depend on xhtml, which now comes with GHC
-  * New upstream release
   * Change section to web (Closes: #784813) 
+  * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Sun, 05 Apr 2015 18:58:54 +0200
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 21 May 2015 23:42:58 +0200
 
 gitit (0.10.4-2) unstable; urgency=medium
 
diff -rN -u old-gitit/control new-gitit/control
--- old-gitit/control	2015-05-21 22:07:42.545008363 +0000
+++ new-gitit/control	2015-05-21 22:07:42.549008452 +0000
@@ -25,8 +25,9 @@
  , libghc-highlighting-kate-dev (<< 0.6)
  , libghc-text-dev
  , libghc-random-dev
- , libghc-network-dev (>= 2.3)
- , libghc-network-dev (<< 2.6)
+ , libghc-network-dev (>= 2.6)
+ , libghc-network-uri-dev (>= 2.6)
+ , libghc-network-uri-dev (<< 2.7)
  , libghc-utf8-string-dev (>= 0.3)
  , libghc-utf8-string-dev (<< 1.1)
  , libghc-sha-dev (>= 1)
@@ -87,6 +88,7 @@
  , libghc-text-prof
  , libghc-random-prof
  , libghc-network-prof
+ , libghc-network-uri-prof
  , libghc-utf8-string-prof
  , libghc-sha-prof
  , libghc-http-prof
@@ -126,6 +128,7 @@
  , libghc-text-doc
  , libghc-random-doc
  , libghc-network-doc
+ , libghc-network-uri-doc
  , libghc-utf8-string-doc
  , libghc-sha-doc
  , libghc-http-doc
diff -rN -u old-gitit/patches/comment-type-signature new-gitit/patches/comment-type-signature
--- old-gitit/patches/comment-type-signature	2015-05-21 22:07:42.545008363 +0000
+++ new-gitit/patches/comment-type-signature	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Description: Comment out type signature in readFile function
- When this type signature is present, a bug elsewhere (possibly in Haddock)
- causes the document generation (and thus the build) to fail with a message
- about this function's use of the FlexibleContexts extension to Haskell. If we
- comment it out then the bug is not triggered and everything still works
- because GHC can infer the type of the function.
-Author: Iain Lane <laney at debian.org>
-Forwarded: no
-
---- a/Network/Gitit/Config.hs
-+++ b/Network/Gitit/Config.hs
-@@ -51,10 +51,10 @@
-   readfile cp fname >>= extractConfig . forceEither
- 
- -- | A version of readfile that treats the file as UTF-8.
--readfile :: MonadError CPError m
--          => ConfigParser
--          -> FilePath
--          -> IO (m ConfigParser)
-+-- readfile :: MonadError CPError m
-+--           => ConfigParser
-+--           -> FilePath
-+--           -> IO (m ConfigParser)
- readfile cp path' = do
-   contents <- readFileUTF8 path'
-   return $ readstring cp contents
diff -rN -u old-gitit/patches/series new-gitit/patches/series
--- old-gitit/patches/series	2015-05-21 22:07:42.545008363 +0000
+++ new-gitit/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-comment-type-signature