[Pkg-haskell-commits] darcs: haskell-hsql: * Fixes for changed behaviour in GHC 7.4

[Iain Lane]

Thu Mar  1 21:37:26 UTC 2012  Iain Lane <laney at debian.org>
  * * Fixes for changed behaviour in GHC 7.4
  Ignore-this: 58fc8b4bf722bccff7de75f136a0de6b
    + Use mkTyCon3 instead of deprecated mkTyCon in DB/HSQL/Error.hs. Takes 3
      Strings: (Package Name, Module Name, Constructor)
    + Also import constructors of CType in DB/HSQL/Type/Time.hsc. GHC 7.6 will
      make using abstract newtypes in FFI declarations an error (for now it is
      just a warning).
    + Use FlexibleInstances extension in DB/HSQL/Type/Diverse.hs in order to
      allow SqlBind instance to be defined for String ([Char]). * 

    M ./changelog +13
    A ./patches/
    A ./patches/ghc-7.4-errors-and-warnings
    A ./patches/series

Thu Mar  1 21:37:26 UTC 2012  Iain Lane <laney at debian.org>
  * * Fixes for changed behaviour in GHC 7.4
  Ignore-this: 58fc8b4bf722bccff7de75f136a0de6b
    + Use mkTyCon3 instead of deprecated mkTyCon in DB/HSQL/Error.hs. Takes 3
      Strings: (Package Name, Module Name, Constructor)
    + Also import constructors of CType in DB/HSQL/Type/Time.hsc. GHC 7.6 will
      make using abstract newtypes in FFI declarations an error (for now it is
      just a warning).
    + Use FlexibleInstances extension in DB/HSQL/Type/Diverse.hs in order to
      allow SqlBind instance to be defined for String ([Char]). * 
diff -rN -u old-haskell-hsql//changelog new-haskell-hsql//changelog
--- old-haskell-hsql//changelog	2012-03-01 22:42:21.533746905 +0000
+++ new-haskell-hsql//changelog	2012-03-01 22:42:21.557751258 +0000
@@ -1,3 +1,16 @@
+haskell-hsql (1.8.1-3) UNRELEASED; urgency=low
+
+  * Fixes for changed behaviour in GHC 7.4
+    + Use mkTyCon3 instead of deprecated mkTyCon in DB/HSQL/Error.hs. Takes 3
+      Strings: (Package Name, Module Name, Constructor)
+    + Also import constructors of CType in DB/HSQL/Type/Time.hsc. GHC 7.6 will
+      make using abstract newtypes in FFI declarations an error (for now it is
+      just a warning).
+    + Use FlexibleInstances extension in DB/HSQL/Type/Diverse.hs in order to
+      allow SqlBind instance to be defined for String ([Char]). * 
+
+ -- Iain Lane <laney at debian.org>  Thu, 01 Mar 2012 21:36:01 +0000
+
 haskell-hsql (1.8.1-2) unstable; urgency=low
 
   * Add Replaces/Conflicts on libghc6-*-doc package (Closes: #656428)
diff -rN -u old-haskell-hsql//patches/ghc-7.4-errors-and-warnings new-haskell-hsql//patches/ghc-7.4-errors-and-warnings
--- old-haskell-hsql//patches/ghc-7.4-errors-and-warnings	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hsql//patches/ghc-7.4-errors-and-warnings	2012-03-01 22:42:21.541751306 +0000
@@ -0,0 +1,50 @@
+Description: Fixes for changed behaviour in GHC 7.4
+  - Use mkTyCon3 instead of deprecated mkTyCon in DB/HSQL/Error.hs. Takes 3
+    Strings: (Package Name, Module Name, Constructor)
+  - Also import constructors of CType in DB/HSQL/Type/Time.hsc. GHC 7.6 will
+    make using abstract newtypes in FFI declarations an error (for now it is
+    just a warning).
+  - Use FlexibleInstances extension in DB/HSQL/Type/Diverse.hs in order to
+    allow SqlBind instance to be defined for String ([Char]).
+Author: Iain Lane <laney at debian.org>
+Forwarded: private email
+
+--- haskell-hsql-1.8.1.orig/DB/HSQL/Error.hs
++++ haskell-hsql-1.8.1/DB/HSQL/Error.hs
+@@ -4,7 +4,7 @@
+ module DB.HSQL.Error(SqlError(..),sqlErrorTc) where
+ 
+ import Control.Exception(Exception(..),SomeException(..))
+-import Data.Dynamic(Typeable,TyCon,mkTyCon,cast)
++import Data.Typeable(Typeable,TyCon,mkTyCon3,cast)
+ 
+ import DB.HSQL.Type(SqlType)
+ 
+@@ -32,7 +32,7 @@ instance Typeable SqlError where
+ #endif
+ 
+ sqlErrorTc :: TyCon
+-sqlErrorTc = mkTyCon "Database.HSQL.SqlError"
++sqlErrorTc = mkTyCon3 "Database" "HSQL" "SqlError"
+ 
+ -- |
+ instance Show SqlError where
+--- haskell-hsql-1.8.1.orig/DB/HSQL/Type/Time.hsc
++++ haskell-hsql-1.8.1/DB/HSQL/Type/Time.hsc
+@@ -8,7 +8,7 @@ import System.Time(ClockTime(..),Calenda
+ import Text.ParserCombinators.ReadP(ReadP,char,skipSpaces,readP_to_S)
+ import Text.Read.Lex(readDecP)
+ import Foreign(Ptr,allocaBytes,pokeByteOff)
+-import Foreign.C(CTime,CInt)
++import Foreign.C(CTime(..),CInt)
+ 
+ import DB.HSQL.Type
+     (SqlType(SqlTimeTZ,SqlTime,SqlDate,SqlDateTimeTZ,SqlDateTime
+--- haskell-hsql-1.8.1.orig/DB/HSQL/Type/Diverse.hs
++++ haskell-hsql-1.8.1/DB/HSQL/Type/Diverse.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE TypeSynonymInstances #-}
++{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
+ module DB.HSQL.Type.Diverse where
+ 
+ import Foreign(nullPtr)
diff -rN -u old-haskell-hsql//patches/series new-haskell-hsql//patches/series
--- old-haskell-hsql//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hsql//patches/series	2012-03-01 22:42:21.545753199 +0000
@@ -0,0 +1 @@
+ghc-7.4-errors-and-warnings