[Pkg-haskell-commits] darcs: haskell-distributive: Fix inverted #ifdef for hlint.

[Colin Watson]

Mon Apr 28 09:57:53 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Fix inverted #ifdef for hlint.

    M ./changelog +6
    A ./patches/build-without-ghci.diff
    M ./patches/series +1

Mon Apr 28 09:57:53 UTC 2014  Colin Watson <cjwatson at debian.org>
  * Fix inverted #ifdef for hlint.
diff -rN -u old-haskell-distributive/changelog new-haskell-distributive/changelog
--- old-haskell-distributive/changelog	2014-04-28 09:58:24.544907467 +0000
+++ new-haskell-distributive/changelog	2014-04-28 09:58:24.544907467 +0000
@@ -1,3 +1,9 @@
+haskell-distributive (0.4.3.1-2) UNRELEASED; urgency=medium
+
+  * Fix inverted #ifdef for hlint.
+
+ -- Colin Watson <cjwatson at debian.org>  Mon, 28 Apr 2014 10:57:03 +0100
+
 haskell-distributive (0.4.3.1-1) unstable; urgency=medium
 
   * New upstream version.
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	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-distributive/patches/build-without-ghci.diff	2014-04-28 09:58:24.548907467 +0000
@@ -0,0 +1,21 @@
+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/series new-haskell-distributive/patches/series
--- old-haskell-distributive/patches/series	2014-04-28 09:58:24.544907467 +0000
+++ new-haskell-distributive/patches/series	2014-04-28 09:58:24.548907467 +0000
@@ -1,2 +1,3 @@
 no-transformers-compat.diff
 doctest-pathfix.diff
+build-without-ghci.diff