[Pkg-haskell-commits] darcs: haskell-vector: Disable annotation if GHCI is not available. Needs latest haskell-devscripts. (Closes: #640088)

[Joachim Breitner]

Sun Sep  4 17:32:43 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Disable annotation if GHCI is not available. Needs latest haskell-devscripts. (Closes: #640088)
  Ignore-this: 8c0229b35907445c750ab801267c229c

    M ./changelog +7
    M ./control -1 +1
    A ./patches/
    A ./patches/no_ann_without_ghci

Sun Sep  4 17:32:43 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Disable annotation if GHCI is not available. Needs latest haskell-devscripts. (Closes: #640088)
  Ignore-this: 8c0229b35907445c750ab801267c229c
diff -rN -u old-haskell-vector//changelog new-haskell-vector//changelog
--- old-haskell-vector//changelog	2011-09-04 17:35:27.682238739 +0000
+++ new-haskell-vector//changelog	2011-09-04 17:35:27.698184045 +0000
@@ -1,3 +1,10 @@
+haskell-vector (0.9-2) UNRELEASED; urgency=low
+
+  * Disable annotation if GHCI is not available. Needs latest
+    haskell-devscripts. (Closes: #640088)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 04 Sep 2011 19:22:10 +0200
+
 haskell-vector (0.9-1) unstable; urgency=low
 
   [ Joachim Breitner ]
diff -rN -u old-haskell-vector//control new-haskell-vector//control
--- old-haskell-vector//control	2011-09-04 17:35:27.682238739 +0000
+++ new-haskell-vector//control	2011-09-04 17:35:27.690415498 +0000
@@ -6,7 +6,7 @@
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7)
   , cdbs
-  , haskell-devscripts (>= 0.7)
+  , haskell-devscripts (>= 0.8.9)
   , ghc
   , ghc-prof
   , libghc-primitive-dev (>= 0.4.0.1)
diff -rN -u old-haskell-vector//patches/no_ann_without_ghci new-haskell-vector//patches/no_ann_without_ghci
--- old-haskell-vector//patches/no_ann_without_ghci	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-vector//patches/no_ann_without_ghci	2011-09-04 17:35:27.690415498 +0000
@@ -0,0 +1,29 @@
+Description: Disable annotation without ghci
+ Can be removed if ghc ignores annotation without an interpreter:
+ http://hackage.haskell.org/trac/ghc/ticket/4268  
+Author: Joachim Breitner <nomeata at debian.org>
+Bug-Debian: http://bugs.debian.org/640088
+Forwarded: no
+
+--- haskell-vector-0.9.orig/Data/Vector/Fusion/Stream/Monadic.hs
++++ haskell-vector-0.9/Data/Vector/Fusion/Stream/Monadic.hs
+@@ -94,15 +94,19 @@ import Data.Int  ( Int8, Int16, Int32, I
+ import Data.Word ( Word8, Word16, Word32, Word, Word64 )
+ 
+ #if __GLASGOW_HASKELL__ >= 700
++#ifndef DEBIAN_NO_GHCI
+ import GHC.Exts ( SpecConstrAnnotation(..) )
+ #endif
++#endif
+ 
+ #include "vector.h"
+ 
+ data SPEC = SPEC | SPEC2
+ #if __GLASGOW_HASKELL__ >= 700
++#ifndef DEBIAN_NO_GHCI
+ {-# ANN type SPEC ForceSpecConstr #-}
+ #endif
++#endif
+ 
+ 
+ -- | Result of taking a single step in a stream