haskell-crypto: New upstream version 4.2.4.

4 files changed, 40 insertions, 1 deletions

diff --git a/p/haskell-crypto/debian/changelog b/p/haskell-crypto/debian/changelog
index 0645c680d..13062537a 100644
--- a/p/haskell-crypto/debian/changelog
+++ b/p/haskell-crypto/debian/changelog
@@ -1,3 +1,11 @@
+haskell-crypto (4.2.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Bump to Standards-Version 3.9.2.
+  * Add missing class constraints.
+
+ -- Clint Adams <clint@debian.org>  Sun, 12 Feb 2012 22:25:32 -0500
+
 haskell-crypto (4.2.3-2) unstable; urgency=low
 
   * Disable quickcheck, thanks to joey for the patch. (Closes: #624140)
diff --git a/p/haskell-crypto/debian/control b/p/haskell-crypto/debian/control
index 4b37a1ec6..1546856a8 100644
--- a/p/haskell-crypto/debian/control
+++ b/p/haskell-crypto/debian/control
@@ -10,9 +10,12 @@ Build-Depends: debhelper (>= 7)
   , ghc-prof
   , libghc-hunit-dev
   , libghc-hunit-prof
+  , libghc-random-dev
+  , libghc-random-prof
 Build-Depends-Indep: ghc-doc
   , libghc-hunit-doc
-Standards-Version: 3.9.1
+  , libghc-random-doc
+Standards-Version: 3.9.2
 Homepage: http://hackage.haskell.org/package/Crypto
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-crypto
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-crypto
diff --git a/p/haskell-crypto/debian/patches/class-constraints.diff b/p/haskell-crypto/debian/patches/class-constraints.diff
new file mode 100644
index 000000000..2760f08f6
--- /dev/null
+++ b/p/haskell-crypto/debian/patches/class-constraints.diff
@@ -0,0 +1,27 @@
+--- a/Data/Digest/SHA2.hs
++++ b/Data/Digest/SHA2.hs
+@@ -106,7 +106,7 @@
+ data Hash384 = Hash384 !Word64 !Word64 !Word64 !Word64 !Word64 !Word64 deriving (Eq, Ord)
+ data Hash224 = Hash224 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 !Word32 deriving (Eq, Ord)
+
+-instance (Integral a) => Show (Hash8 a) where
++instance (Integral a, Show a) => Show (Hash8 a) where
+  showsPrec _ (Hash8 a b c d e f g h) =
+   (showHex a) . (' ':) .
+   (showHex b) . (' ':) .
+@@ -146,7 +146,7 @@
+      where
+       bs = bitSize (head r)
+
+-instance (Integral h, Bits h) => Hash (Hash8 h) where
++instance (Integral h, Bits h, Show h) => Hash (Hash8 h) where
+   toOctets (Hash8 x0 x1 x2 x3 x4 x5 x6 x7) = bitsToOctets =<< [x0, x1, x2, x3, x4, x5, x6, x7]
+
+ instance Hash Hash384 where
+@@ -282,4 +282,4 @@
+
+ -- Test with:
+ -- ghc -no-recomp -O --make Data/Digest/SHA2.hs -main-is Data.Digest.SHA2.moduleTest -o moduleTest && ./moduleTest && rm moduleTest
+-moduleTest = runTestTT test_sha2
+\ No newline at end of file
++moduleTest = runTestTT test_sha2
diff --git a/p/haskell-crypto/debian/patches/series b/p/haskell-crypto/debian/patches/series
index cf1e9241c..f37693112 100644
--- a/p/haskell-crypto/debian/patches/series
+++ b/p/haskell-crypto/debian/patches/series
@@ -1 +1,2 @@
+class-constraints.diff
 no-quickcheck.patch