[Pkg-haskell-commits] darcs: hmake: Fix FTBFS: Compat.hs:47:55: Not in scope: `isAlphanum' (Closes: #628308)

[Joachim Breitner]

Thu Jun  2 18:24:01 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Fix FTBFS: Compat.hs:47:55: Not in scope: `isAlphanum' (Closes: #628308)
  Ignore-this: 20bfeb32bb9b84dc2b2273837933616e

    M ./changelog +3
    A ./patches/avoid-CPP
    M ./patches/series +1

Thu Jun  2 18:24:01 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Fix FTBFS: Compat.hs:47:55: Not in scope: `isAlphanum' (Closes: #628308)
  Ignore-this: 20bfeb32bb9b84dc2b2273837933616e
diff -rN -u old-hmake//changelog new-hmake//changelog
--- old-hmake//changelog	2011-06-02 18:26:20.857467008 +0000
+++ new-hmake//changelog	2011-06-02 18:26:20.877279913 +0000
@@ -6,6 +6,9 @@
   [ Marco Silva ]
   * Use ghc instead of ghc6
 
+  [ Joachim Breitner ]
+  * Fix FTBFS: Compat.hs:47:55: Not in scope: `isAlphanum' (Closes: #628308)
+
  -- Joachim Breitner <nomeata at debian.org>  Sat, 01 May 2010 22:15:44 +0200
 
 hmake (3.14-2) unstable; urgency=low
diff -rN -u old-hmake//patches/avoid-CPP new-hmake//patches/avoid-CPP
--- old-hmake//patches/avoid-CPP	1970-01-01 00:00:00.000000000 +0000
+++ new-hmake//patches/avoid-CPP	2011-06-02 18:26:20.865275486 +0000
@@ -0,0 +1,71 @@
+Description: Remove CPP magic, use isAlphaNum directly.
+Bug-Debian: http://bugs.debian.org/628308
+Author: Joachim Breitner <nomeata at debian.org>
+
+Index: hmake-3.14/src/hmake/Compat.hs
+===================================================================
+--- hmake-3.14.orig/src/hmake/Compat.hs	2011-06-02 19:28:19.000000000 +0200
++++ hmake-3.14/src/hmake/Compat.hs	2011-06-02 19:28:19.000000000 +0200
+@@ -17,10 +17,6 @@
+ import QSort(sortLe)
+ import Char
+ 
+-#if defined(__HASKELL98__)
+-#define isAlphanum isAlphaNum
+-#endif
+-
+ assocFail :: (Eq a) => a -> [(a, b)] -> b
+ assocFail x xs = assocDef xs (error "assocFail") x
+ 
+@@ -44,7 +40,7 @@
+ takeWord (' ':cs) = takeWord cs
+ takeWord ('\n':cs) = takeWord cs
+ takeWord ('\t':cs) = takeWord cs
+-takeWord (c:cs) | isAlpha c = let (w,cs1) = span (\c->isAlphanum c || c=='_') cs in (c:w,cs1)
++takeWord (c:cs) | isAlpha c = let (w,cs1) = span (\c->isAlphaNum c || c=='_') cs in (c:w,cs1)
+ 		| isDigit c = let (w,cs') = span isDigit cs in (c:w, cs')
+ 		| otherwise = ([c], cs)
+ 
+Index: hmake-3.14/src/hmake/Imports.hs
+===================================================================
+--- hmake-3.14.orig/src/hmake/Imports.hs	2011-06-02 19:32:28.000000000 +0200
++++ hmake-3.14/src/hmake/Imports.hs	2011-06-02 19:32:41.000000000 +0200
+@@ -20,10 +20,6 @@
+ import Language.Preprocessor.Cpphs.Options  (BoolOptions(..)
+                                             ,defaultBoolOptions)
+ 
+-#if !defined(__HASKELL98__)
+-#define isAlphaNum isAlphanum
+-#endif
+-
+ -- | Get the imports for this Haskell module.
+ getImports :: FilePath -- ^ The path to the module
+            -> [String] -- ^ Definitions to build a symbol table (for cpp)
+Index: hmake-3.14/src/hmake/GetDep.hs
+===================================================================
+--- hmake-3.14.orig/src/hmake/GetDep.hs	2011-06-02 19:33:02.000000000 +0200
++++ hmake-3.14/src/hmake/GetDep.hs	2011-06-02 19:33:25.000000000 +0200
+@@ -24,9 +24,7 @@
+ #if defined(__HBC__)
+ import FileStat
+ #endif
+-#if defined(__HASKELL98__)
+ import Directory
+-#endif
+ import IO
+ import Time
+ import List (intersperse)
+--- hmake-3.14.orig/src/interpreter/LexModule.hs
++++ hmake-3.14/src/interpreter/LexModule.hs
+@@ -3,11 +3,6 @@ module LexModule (lexmodule, nestcomment
+ import Char
+ import List
+ 
+-#if !defined(__HASKELL98__)
+-#define isAlphaNum isAlphanum
+-#endif
+-
+-
+ -- lexmodule takes a string (file content), removes any module header,
+ -- and renames any function beginning in the left-most column called
+ -- "main" to "_ain".
diff -rN -u old-hmake//patches/series new-hmake//patches/series
--- old-hmake//patches/series	2011-06-02 18:26:20.857467008 +0000
+++ new-hmake//patches/series	2011-06-02 18:26:20.900798918 +0000
@@ -4,3 +4,4 @@
 force_arch_debian
 no-package-lang.patch
 use-editline-instead-of-readline.patch
+avoid-CPP