haskell-distributive: Let it build without GHCi (thx to Joey Hess for the patch) (Closes: #726173)

4 files changed, 50 insertions, 2 deletions

diff --git a/p/haskell-distributive/debian/changelog b/p/haskell-distributive/debian/changelog
index 913d9edb0..e6a2b1fe8 100644
--- a/p/haskell-distributive/debian/changelog
+++ b/p/haskell-distributive/debian/changelog
@@ -1,6 +1,8 @@
 haskell-distributive (0.3-3) UNRELEASED; urgency=low
 
   * Adjust watch file to new hackage layout
+  * Let it build without GHCi (thx to Joey Hess for the patch) (Closes:
+    #726173)
 
  -- Joachim Breitner <nomeata@debian.org>  Sat, 05 Oct 2013 18:20:10 +0200
 
diff --git a/p/haskell-distributive/debian/control b/p/haskell-distributive/debian/control
index c2d7d6b0d..572b47f9f 100644
--- a/p/haskell-distributive/debian/control
+++ b/p/haskell-distributive/debian/control
@@ -3,13 +3,11 @@ Section: haskell
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Iulian Udrea <iulian@linux.com>
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 9)
  , cdbs
  , haskell-devscripts (>= 0.8.15)
  , ghc
  , ghc-prof
- , ghc-ghci
  , libghc-transformers-dev (>> 0.3)
  , libghc-transformers-dev (<< 0.4)
  , libghc-transformers-prof
diff --git a/p/haskell-distributive/debian/patches/0001-fix-build-on-armel.patch b/p/haskell-distributive/debian/patches/0001-fix-build-on-armel.patch
new file mode 100644
index 000000000..8194e2132
--- /dev/null
+++ b/p/haskell-distributive/debian/patches/0001-fix-build-on-armel.patch
@@ -0,0 +1,47 @@
+From ef79f8fbbff8501b99ff08addfef752176f61117 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey@kitenet.net>
+Date: Sat, 12 Oct 2013 22:26:45 -0400
+Subject: [PATCH] fix build on armel
+
+---
+ distributive.cabal       |    1 +
+ src/Data/Distributive.hs |    4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/distributive.cabal b/distributive.cabal
+index 316962a..562f99a 100644
+--- a/distributive.cabal
++++ b/distributive.cabal
+@@ -37,6 +37,7 @@ library
+
+   hs-source-dirs:  src
+   exposed-modules: Data.Distributive
++  extensions: CPP
+
+   if flag(lib-Werror)
+     ghc-options: -Werror
+diff --git a/src/Data/Distributive.hs b/src/Data/Distributive.hs
+index 6f5613d..171ec2f 100644
+--- a/src/Data/Distributive.hs
++++ b/src/Data/Distributive.hs
+@@ -15,6 +15,8 @@ module Data.Distributive
+   , comapM
+   ) where
+
++{-# LANGUAGE CPP #-}
++
+ import Control.Applicative
+ import Control.Applicative.Backwards
+ import Control.Monad (liftM)
+@@ -26,7 +28,9 @@ import Data.Functor.Identity
+ import Data.Functor.Product
+ import Data.Functor.Reverse
+
++#ifndef DEBIAN_NO_GHCI
+ {-# ANN module "ignore Use section" #-}
++#endif
+
+ -- | This is the categorical dual of 'Traversable'. However, there appears
+ -- to be little benefit to allow the distribution via an arbitrary comonad
+--
+1.7.10.4
diff --git a/p/haskell-distributive/debian/patches/series b/p/haskell-distributive/debian/patches/series
index d0b687c70..f70a58ba9 100644
--- a/p/haskell-distributive/debian/patches/series
+++ b/p/haskell-distributive/debian/patches/series
@@ -1 +1,2 @@
 no-transformers-compat.diff
+0001-fix-build-on-armel.patch