[Pkg-haskell-commits] darcs: haskell-hstringtemplate: releasing version 0.6.6-2

[joeyh at debian.org]

Thu Mar  1 18:43:03 UTC 2012  joeyh at debian.org
  * releasing version 0.6.6-2
  Ignore-this: b3dad622de744680a2c16211bdc651e5

    M ./changelog +8
    M ./control -1 +1
    A ./patches/
    A ./patches/ghc7.4-fixes
    A ./patches/series

Thu Mar  1 18:43:03 UTC 2012  joeyh at debian.org
  * releasing version 0.6.6-2
  Ignore-this: b3dad622de744680a2c16211bdc651e5
diff -rN -u old-haskell-hstringtemplate//changelog new-haskell-hstringtemplate//changelog
--- old-haskell-hstringtemplate//changelog	2012-03-01 18:43:04.866252342 +0000
+++ new-haskell-hstringtemplate//changelog	2012-03-01 18:43:04.874252367 +0000
@@ -1,3 +1,11 @@
+haskell-hstringtemplate (0.6.6-2) unstable; urgency=low
+
+  * Sourceful upload to rebuild documentation package
+  * Add Show instance to ToSElem, fixing build with ghc 7.4.
+  * Fix homepage url.
+
+ -- Joey Hess <joeyh at debian.org>  Thu, 01 Mar 2012 14:30:06 -0400
+
 haskell-hstringtemplate (0.6.6-1) unstable; urgency=low
 
   [ Marco Túlio Gontijo e Silva ]
diff -rN -u old-haskell-hstringtemplate//control new-haskell-hstringtemplate//control
--- old-haskell-hstringtemplate//control	2012-03-01 18:43:04.866252342 +0000
+++ new-haskell-hstringtemplate//control	2012-03-01 18:43:04.882251224 +0000
@@ -33,7 +33,7 @@
  libghc-deepseq-doc,
  libghc-utf8-string-doc
 Standards-Version: 3.9.1
-Homepage: http://hackage.haskell.org/package/hstringtemplate
+Homepage: http://hackage.haskell.org/package/HStringTemplate
 Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/haskell-hstringtemplate
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-hstringtemplate
 
diff -rN -u old-haskell-hstringtemplate//patches/ghc7.4-fixes new-haskell-hstringtemplate//patches/ghc7.4-fixes
--- old-haskell-hstringtemplate//patches/ghc7.4-fixes	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hstringtemplate//patches/ghc7.4-fixes	2012-03-01 18:43:04.882251224 +0000
@@ -0,0 +1,27 @@
+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	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hstringtemplate//patches/series	2012-03-01 18:43:04.886256829 +0000
@@ -0,0 +1 @@
+ghc7.4-fixes