[Pkg-haskell-commits] darcs: haskell-openpgp: New upstream version 0.6.1.
Clint Adams
clint at debian.org
Fri Sep 19 20:19:48 UTC 2014
Fri Sep 19 20:19:37 UTC 2014 Clint Adams <clint at debian.org>
* New upstream version 0.6.1.
M ./changelog -2 +6
M ./control -2 +5
R ./patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch
R ./patches/disable-missing-test.diff
A ./patches/disable-missing-tests.diff
M ./patches/series -2 +1
Fri Sep 19 20:19:37 UTC 2014 Clint Adams <clint at debian.org>
* New upstream version 0.6.1.
diff -rN -u old-haskell-openpgp/changelog new-haskell-openpgp/changelog
--- old-haskell-openpgp/changelog 2014-09-19 20:19:48.490684629 +0000
+++ new-haskell-openpgp/changelog 2014-09-19 20:19:48.494684629 +0000
@@ -1,8 +1,12 @@
-haskell-openpgp (0.4-4) UNRELEASED; urgency=low
+haskell-openpgp (0.6.1-1) unstable; urgency=medium
+ [ Joachim Breitner ]
* Adjust watch file to new hackage layout
- -- Joachim Breitner <nomeata at debian.org> Sat, 05 Oct 2013 18:21:13 +0200
+ [ Clint Adams ]
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Fri, 19 Sep 2014 16:03:30 -0400
haskell-openpgp (0.4-3) unstable; urgency=low
diff -rN -u old-haskell-openpgp/control new-haskell-openpgp/control
--- old-haskell-openpgp/control 2014-09-19 20:19:48.490684629 +0000
+++ new-haskell-openpgp/control 2014-09-19 20:19:48.498684629 +0000
@@ -8,6 +8,8 @@
, cdbs
, ghc
, ghc-prof
+ , libghc-binary-dev (>= 0.6.4.0)
+ , libghc-binary-prof (>= 0.6.4.0)
, libghc-bzlib-dev
, libghc-bzlib-prof
, libghc-utf8-string-dev
@@ -15,16 +17,17 @@
, libghc-zlib-dev
, libghc-zlib-prof
, libghc-hunit-dev
- , libghc-quickcheck2-dev (>> 2.4.1.1)
+ , libghc-quickcheck2-dev (>= 2.4.1.1)
, libghc-quickcheck-instances-dev
, libghc-test-framework-dev
, libghc-test-framework-hunit-dev
, libghc-test-framework-quickcheck2-dev
Build-Depends-Indep: ghc-doc
+ , libghc-binary-doc
, libghc-bzlib-doc
, libghc-utf8-string-doc
, libghc-zlib-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-openpgp
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-openpgp
Homepage: http://github.com/singpolyma/OpenPGP-Haskell
diff -rN -u old-haskell-openpgp/patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch new-haskell-openpgp/patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch
--- old-haskell-openpgp/patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch 2014-09-19 20:19:48.490684629 +0000
+++ new-haskell-openpgp/patches/0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-From a595481760fe5c4dc2e970a3a164ac12d4005d73 Mon Sep 17 00:00:00 2001
-From: Stephen Paul Weber <singpolyma at singpolyma.net>
-Date: Tue, 11 Sep 2012 11:34:49 -0500
-Subject: [PATCH 1/2] Better bit counting. Handle the bitlength of 0
-
-Closes #17
----
- Data/OpenPGP.hs | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
-index 70bd29a..a268dff 100644
---- a/Data/OpenPGP.hs
-+++ b/Data/OpenPGP.hs
-@@ -62,6 +62,7 @@ module Data.OpenPGP (
-
- import Numeric
- import Control.Monad
-+import Control.Arrow
- import Control.Exception (assert)
- import Data.Bits
- import Data.Word
-@@ -790,19 +791,23 @@ signatures_and_data (Message lst) =
- newtype MPI = MPI Integer deriving (Show, Read, Eq, Ord)
- instance BINARY_CLASS MPI where
- put (MPI i) = do
-- put (((fromIntegral . B.length $ bytes) - 1) * 8
-- + floor (logBase (2::Double) $ fromIntegral (bytes `B.index` 0))
-- + 1 :: Word16)
-+ put (bitl :: Word16)
- putSomeByteString bytes
- where
-- bytes = if B.null bytes' then B.singleton 0 else bytes'
-+ (bytes, bitl)
-+ | B.null bytes' = (B.singleton 0, 1)
-+ | otherwise =
-+ (bytes', (fromIntegral (B.length bytes') - 1) * 8 + sigBit)
-+
-+ sigBit = fst $ until ((==0) . snd)
-+ (first (+1) . second (`shiftR` 1)) (0,B.index bytes 0)
- bytes' = B.reverse $ B.unfoldr (\x ->
- if x == 0 then Nothing else
- Just (fromIntegral x, x `shiftR` 8)
- ) (assertProp (>=0) i)
- get = do
- length <- fmap fromIntegral (get :: Get Word16)
-- bytes <- getSomeByteString ((length + 7) `div` 8)
-+ bytes <- getSomeByteString (assertProp (>0) $ (length + 7) `div` 8)
- return (MPI (B.foldl (\a b ->
- a `shiftL` 8 .|. fromIntegral b) 0 bytes))
-
---
-1.7.10.4
-
diff -rN -u old-haskell-openpgp/patches/disable-missing-test.diff new-haskell-openpgp/patches/disable-missing-test.diff
--- old-haskell-openpgp/patches/disable-missing-test.diff 2014-09-19 20:19:48.490684629 +0000
+++ new-haskell-openpgp/patches/disable-missing-test.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- a/tests/suite.hs
-+++ b/tests/suite.hs
-@@ -130,7 +130,7 @@
- testCase "000076-007.secret_subkey" (testSerialization "000076-007.secret_subkey"),
- testCase "000077-002.sig" (testSerialization "000077-002.sig"),
- testCase "000078-012.ring_trust" (testSerialization "000078-012.ring_trust"),
-- testCase "002182-002.sig" (testSerialization "002182-002.sig"),
-+ -- testCase "002182-002.sig" (testSerialization "002182-002.sig"),
- testCase "pubring.gpg" (testSerialization "pubring.gpg"),
- testCase "secring.gpg" (testSerialization "secring.gpg"),
- testCase "compressedsig.gpg" (testSerialization "compressedsig.gpg"),
diff -rN -u old-haskell-openpgp/patches/disable-missing-tests.diff new-haskell-openpgp/patches/disable-missing-tests.diff
--- old-haskell-openpgp/patches/disable-missing-tests.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-openpgp/patches/disable-missing-tests.diff 2014-09-19 20:19:48.498684629 +0000
@@ -0,0 +1,13 @@
+--- a/tests/suite.hs
++++ b/tests/suite.hs
+@@ -145,8 +145,8 @@
+ testCase "uncompressed-ops-dsa.gpg" (testSerialization "uncompressed-ops-dsa.gpg"),
+ testCase "uncompressed-ops-dsa-sha384.txt.gpg" (testSerialization "uncompressed-ops-dsa-sha384.txt.gpg"),
+ testCase "uncompressed-ops-rsa.gpg" (testSerialization "uncompressed-ops-rsa.gpg"),
+- testCase "3F5BBA0B0694BEB6000005-002.sig" (testSerialization "3F5BBA0B0694BEB6000005-002.sig"),
+- testCase "3F5BBA0B0694BEB6000017-002.sig" (testSerialization "3F5BBA0B0694BEB6000017-002.sig"),
++ -- testCase "3F5BBA0B0694BEB6000005-002.sig" (testSerialization "3F5BBA0B0694BEB6000005-002.sig"),
++ -- testCase "3F5BBA0B0694BEB6000017-002.sig" (testSerialization "3F5BBA0B0694BEB6000017-002.sig"),
+ testProperty "MPI encode/decode" prop_MPI_serialization_loop,
+ testProperty "S2K encode/decode" prop_S2K_serialization_loop,
+ testProperty "SignatureSubpacket encode/decode" prop_SignatureSubpacket_serialization_loop
diff -rN -u old-haskell-openpgp/patches/series new-haskell-openpgp/patches/series
--- old-haskell-openpgp/patches/series 2014-09-19 20:19:48.486684630 +0000
+++ new-haskell-openpgp/patches/series 2014-09-19 20:19:48.502684629 +0000
@@ -1,2 +1 @@
-disable-missing-test.diff
-0001-Better-bit-counting.-Handle-the-bitlength-of-0.patch
+disable-missing-tests.diff
More information about the Pkg-haskell-commits
mailing list