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

[Joachim Breitner]

Sun Sep  7 15:48:16 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog +6
    M ./control -1 +1
    R ./patches/build-without-ghci.diff
    M ./patches/no-transformers-compat.diff -3 +3
    M ./patches/series -1

Sun Sep  7 15:48:16 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-haskell-distributive/changelog new-haskell-distributive/changelog
--- old-haskell-distributive/changelog	2014-09-07 16:12:12.435390690 +0000
+++ new-haskell-distributive/changelog	2014-09-07 16:12:12.443390691 +0000
@@ -1,3 +1,9 @@
+haskell-distributive (0.4.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 07 Sep 2014 16:30:38 +0200
+
 haskell-distributive (0.4.3.1-2) unstable; urgency=medium
 
   * Fix inverted #ifdef for hlint.
diff -rN -u old-haskell-distributive/control new-haskell-distributive/control
--- old-haskell-distributive/control	2014-09-07 16:12:12.435390690 +0000
+++ new-haskell-distributive/control	2014-09-07 16:12:12.439390691 +0000
@@ -12,7 +12,7 @@
  , libghc-tagged-dev (<< 1)
  , libghc-tagged-prof
  , libghc-transformers-dev (>> 0.3)
- , libghc-transformers-dev (<< 0.4)
+ , libghc-transformers-dev (<< 0.5)
  , libghc-transformers-prof
  , libghc-doctest-dev
 Build-Depends-Indep: ghc-doc
diff -rN -u old-haskell-distributive/patches/build-without-ghci.diff new-haskell-distributive/patches/build-without-ghci.diff
--- old-haskell-distributive/patches/build-without-ghci.diff	2014-09-07 16:12:12.435390690 +0000
+++ new-haskell-distributive/patches/build-without-ghci.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-Description: Fix inverted #ifdef for hlint
- The annotation should be used when using hlint, not when not using it.
- This fixes builds without GHCi with GHC builds predating the fix for
- https://ghc.haskell.org/trac/ghc/ticket/4268.
-Author: Colin Watson <cjwatson at debian.org>
-Forwarded: https://github.com/ekmett/distributive/pull/6
-Last-Update: 2014-04-28
-
-Index: b/src/Data/Distributive.hs
-===================================================================
---- a/src/Data/Distributive.hs
-+++ b/src/Data/Distributive.hs
-@@ -32,7 +32,7 @@
- import Data.Proxy
- import Data.Tagged
- 
--#ifndef HLINT
-+#ifdef HLINT
- {-# ANN module "hlint: ignore Use section" #-}
- #endif
- 
diff -rN -u old-haskell-distributive/patches/no-transformers-compat.diff new-haskell-distributive/patches/no-transformers-compat.diff
--- old-haskell-distributive/patches/no-transformers-compat.diff	2014-09-07 16:12:12.435390690 +0000
+++ new-haskell-distributive/patches/no-transformers-compat.diff	2014-09-07 16:12:12.439390691 +0000
@@ -4,9 +4,9 @@
    build-depends:
      base                >= 4   && < 5,
      tagged              >= 0.7 && < 1,
--    transformers        >= 0.2 && < 0.4,
--    transformers-compat >= 0.1 && < 0.2
-+    transformers        >= 0.3 && < 0.4
+-    transformers        >= 0.2 && < 0.5,
+-    transformers-compat >= 0.3 && < 1
++    transformers        >= 0.3 && < 0.5
  
    hs-source-dirs:  src
    exposed-modules:
diff -rN -u old-haskell-distributive/patches/series new-haskell-distributive/patches/series
--- old-haskell-distributive/patches/series	2014-09-07 16:12:12.435390690 +0000
+++ new-haskell-distributive/patches/series	2014-09-07 16:12:12.439390691 +0000
@@ -1,3 +1,2 @@
 no-transformers-compat.diff
 doctest-pathfix.diff
-build-without-ghci.diff