diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2012-10-20 00:41:15 +0400 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2012-10-20 00:41:15 +0400 |
| commit | 0d2ad53fd9640fae21a99503839a7264daaf8c0b (patch) | |
| tree | 124e804ee9c219c83246b67f65e52473c031e0aa /p/haskell-crypto/debian | |
| parent | 77c0be4b2aed96c2de387f2dd897a97d71d74ca9 (diff) | |
| download | DHG_packages-0d2ad53fd9640fae21a99503839a7264daaf8c0b.tar.gz | |
haskell-crypto: Drop class-constraints.diff, applied upstream
Diffstat (limited to 'p/haskell-crypto/debian')
| -rw-r--r-- | p/haskell-crypto/debian/changelog | 1 | ||||
| -rw-r--r-- | p/haskell-crypto/debian/patches/class-constraints.diff | 31 | ||||
| -rw-r--r-- | p/haskell-crypto/debian/patches/series | 1 |
3 files changed, 1 insertions, 32 deletions
diff --git a/p/haskell-crypto/debian/changelog b/p/haskell-crypto/debian/changelog index 11eadf1cd..09fcb1bc0 100644 --- a/p/haskell-crypto/debian/changelog +++ b/p/haskell-crypto/debian/changelog @@ -4,6 +4,7 @@ haskell-crypto (4.2.5-1) UNRELEASED; urgency=low against experimental * Bump standards version, no change * New upstream release + + Drop class-constraints.diff, applied upstream -- Joachim Breitner <nomeata@debian.org> Fri, 19 Oct 2012 22:29:44 +0200 diff --git a/p/haskell-crypto/debian/patches/class-constraints.diff b/p/haskell-crypto/debian/patches/class-constraints.diff deleted file mode 100644 index 68e2af6c8..000000000 --- a/p/haskell-crypto/debian/patches/class-constraints.diff +++ /dev/null @@ -1,31 +0,0 @@ -Description: ghc 7.4 class constraints - This patch has been emailed to upstream Caylee Hogg. -Author: Clint Adams <clint@debian.org> - ---- 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 f37693112..cf1e9241c 100644 --- a/p/haskell-crypto/debian/patches/series +++ b/p/haskell-crypto/debian/patches/series @@ -1,2 +1 @@ -class-constraints.diff no-quickcheck.patch |