[Pkg-haskell-commits] darcs: haskell-hstringtemplate: Drop patch

[Giovanni Mascellani]

Sun May 20 13:18:57 UTC 2012  Giovanni Mascellani <gio at debian.org>
  * Drop patch
  Ignore-this: a81f995c51d36f8eaf0e9840acf42ffa

    M ./changelog +2
    R ./patches/
    R ./patches/ghc7.4-fixes
    R ./patches/series

Sun May 20 13:18:57 UTC 2012  Giovanni Mascellani <gio at debian.org>
  * Drop patch
  Ignore-this: a81f995c51d36f8eaf0e9840acf42ffa
diff -rN -u old-haskell-hstringtemplate//changelog new-haskell-hstringtemplate//changelog
--- old-haskell-hstringtemplate//changelog	2012-05-20 13:30:37.702328645 +0000
+++ new-haskell-hstringtemplate//changelog	2012-05-20 13:30:37.746323924 +0000
@@ -4,6 +4,8 @@
     + Fix dependencies.
   * Bump Standards-Version to 3.9.3 (no changes required).
   * Fix some lintian warnings.
+  * Drop patch to compile with ghc 7.4, since upstream code now compiles
+    correctly.
 
  -- Giovanni Mascellani <gio at debian.org>  Sun, 20 May 2012 13:05:29 +0200
 
diff -rN -u old-haskell-hstringtemplate//patches/ghc7.4-fixes new-haskell-hstringtemplate//patches/ghc7.4-fixes
--- old-haskell-hstringtemplate//patches/ghc7.4-fixes	2012-05-20 13:30:37.710324257 +0000
+++ new-haskell-hstringtemplate//patches/ghc7.4-fixes	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-Description: add Show instance to build with ghc 7.4
- Add Show instance for ToSElem.
- A newer upstream version has these same changes already.
-Author: Joey Hess <joeyh at debian.org>
-
---- haskell-hstringtemplate-0.6.6.orig/Text/StringTemplate/Instances.hs
-+++ haskell-hstringtemplate-0.6.6/Text/StringTemplate/Instances.hs
-@@ -83,7 +83,7 @@ instance ToSElem Int where
- instance ToSElem Integer where
-     toSElem = STR . show
- 
--instance Integral a => ToSElem (Ratio a) where
-+instance (Integral a, Show a) => ToSElem (Ratio a) where
-     toSElem = STR . show
- 
- --Dates and Times
---- haskell-hstringtemplate-0.6.6.orig/Text/StringTemplate/Base.hs
-+++ haskell-hstringtemplate-0.6.6/Text/StringTemplate/Base.hs
-@@ -536,7 +536,7 @@ functn = do
- 
- 
- 
--mkIndex :: Num b => [b] -> [[SElem a]]
-+mkIndex :: (Num b, Show b) => [b] -> [[SElem a]]
- mkIndex = map ((:) . STR . show . (1+) <*> (:[]) . STR . show)
- ix0 :: [SElem a]
- ix0 = [STR "1",STR "0"]
diff -rN -u old-haskell-hstringtemplate//patches/series new-haskell-hstringtemplate//patches/series
--- old-haskell-hstringtemplate//patches/series	2012-05-20 13:30:37.706325260 +0000
+++ new-haskell-hstringtemplate//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-ghc7.4-fixes