[DHG_packages] 78/111: http2: Upgrading from 1.5.3 to 1.6.0
Joachim Breitner
nomeata at moszumanska.debian.org
Sun May 29 10:43:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch LTS-6
in repository DHG_packages.
commit 151d8fb8348f6dc4d8d81efcfbed27c81ae6b4eb
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Sun May 29 12:16:40 2016 +0200
http2: Upgrading from 1.5.3 to 1.6.0
---
p/haskell-http2/debian/changelog | 8 +++-
p/haskell-http2/debian/control | 4 +-
p/haskell-http2/debian/patches/disable-doctest | 6 +--
.../patches/disable-tests-with-external-test-cases | 13 +++--
.../debian/patches/no-bytestring-builder | 34 ++++++-------
p/haskell-http2/debian/patches/series | 1 -
p/haskell-http2/debian/patches/stop-using-memcpy | 55 ----------------------
7 files changed, 34 insertions(+), 87 deletions(-)
diff --git a/p/haskell-http2/debian/changelog b/p/haskell-http2/debian/changelog
index 2c341fc..0651931 100644
--- a/p/haskell-http2/debian/changelog
+++ b/p/haskell-http2/debian/changelog
@@ -1,9 +1,13 @@
-haskell-http2 (1.5.3-4) UNRELEASED; urgency=medium
+haskell-http2 (1.6.0-1) unstable; urgency=medium
+ [ Dmitry Bogatov ]
* Use secure (https) uri in Vcs-Git field in 'debian/control'
* Bump standards version to 3.9.8 (no changes needed)
- -- Dmitry Bogatov <KAction at gnu.org> Tue, 10 May 2016 09:35:34 +0300
+ [ Joachim Breitner ]
+ * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org> Sun, 29 May 2016 12:16:40 +0200
haskell-http2 (1.5.3-3) unstable; urgency=medium
diff --git a/p/haskell-http2/debian/control b/p/haskell-http2/debian/control
index aa48c29..1755164 100644
--- a/p/haskell-http2/debian/control
+++ b/p/haskell-http2/debian/control
@@ -8,6 +8,8 @@ Build-Depends: debhelper (>= 9),
cdbs,
ghc,
ghc-prof,
+ libghc-case-insensitive-dev,
+ libghc-case-insensitive-prof,
libghc-psqueues-dev,
libghc-psqueues-prof,
libghc-stm-dev,
@@ -24,7 +26,7 @@ Build-Depends: debhelper (>= 9),
libghc-doctest-dev (>= 0.9.3),
libghc-hspec-dev (>= 1.3),
Build-Depends-Indep: ghc-doc,
- libghc-mwc-random-doc,
+ libghc-case-insensitive-doc,
libghc-psqueues-doc,
libghc-stm-doc,
Standards-Version: 3.9.8
diff --git a/p/haskell-http2/debian/patches/disable-doctest b/p/haskell-http2/debian/patches/disable-doctest
index 66c7f1d..698b33a 100644
--- a/p/haskell-http2/debian/patches/disable-doctest
+++ b/p/haskell-http2/debian/patches/disable-doctest
@@ -1,8 +1,8 @@
Index: haskell-http2/http2.cabal
===================================================================
---- haskell-http2.orig/http2.cabal 2016-05-03 17:40:34.000000000 +0200
-+++ haskell-http2/http2.cabal 2016-05-03 17:40:48.565770395 +0200
-@@ -88,15 +88,6 @@
+--- haskell-http2.orig/http2.cabal 2016-05-29 12:17:06.186758726 +0200
++++ haskell-http2/http2.cabal 2016-05-29 12:17:06.182758617 +0200
+@@ -89,15 +89,6 @@
----------------------------------------------------------------
diff --git a/p/haskell-http2/debian/patches/disable-tests-with-external-test-cases b/p/haskell-http2/debian/patches/disable-tests-with-external-test-cases
index b7a29b0..7b9387e 100644
--- a/p/haskell-http2/debian/patches/disable-tests-with-external-test-cases
+++ b/p/haskell-http2/debian/patches/disable-tests-with-external-test-cases
@@ -1,6 +1,8 @@
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -119,51 +119,6 @@
+Index: haskell-http2/http2.cabal
+===================================================================
+--- haskell-http2.orig/http2.cabal 2016-05-29 12:19:59.091286217 +0200
++++ haskell-http2/http2.cabal 2016-05-29 12:19:59.087286117 +0200
+@@ -112,52 +112,6 @@
, stm
, word8
@@ -18,6 +20,8 @@
- , aeson-pretty
- , array
- , bytestring
+- , bytestring-builder
+- , case-insensitive
- , containers
- , directory
- , filepath
@@ -48,7 +52,6 @@
- , http2
- , text
- , unordered-containers
--
+
----------------------------------------------------------------
- Executable hpack-encode
diff --git a/p/haskell-http2/debian/patches/no-bytestring-builder b/p/haskell-http2/debian/patches/no-bytestring-builder
index 01d5b0a..10fbbf5 100644
--- a/p/haskell-http2/debian/patches/no-bytestring-builder
+++ b/p/haskell-http2/debian/patches/no-bytestring-builder
@@ -1,50 +1,44 @@
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -61,7 +61,6 @@
+Index: haskell-http2/http2.cabal
+===================================================================
+--- haskell-http2.orig/http2.cabal 2016-05-29 12:17:20.179143186 +0200
++++ haskell-http2/http2.cabal 2016-05-29 12:18:21.984800917 +0200
+@@ -81,7 +81,6 @@
Build-Depends: base >= 4.6 && < 5
, array
, bytestring >= 0.10
- , bytestring-builder
+ , case-insensitive
, containers >= 0.5
, psqueues
- , stm
-@@ -94,7 +93,6 @@
+@@ -105,7 +104,6 @@
Build-Depends: base >= 4 && < 5
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, hex
- , hspec >= 1.3
-@@ -118,7 +116,6 @@
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , directory
- , filepath
-@@ -167,7 +164,6 @@
+@@ -178,7 +130,6 @@
, aeson-pretty
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, hex
- , text
-@@ -188,7 +184,6 @@
+@@ -200,7 +151,6 @@
, aeson
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, hex
- , text
-@@ -210,7 +205,6 @@
+@@ -223,7 +173,6 @@
, aeson-pretty
, array
, bytestring
- , bytestring-builder
+ , case-insensitive
, containers
, directory
- , filepath
diff --git a/p/haskell-http2/debian/patches/series b/p/haskell-http2/debian/patches/series
index 0656d29..9f54861 100644
--- a/p/haskell-http2/debian/patches/series
+++ b/p/haskell-http2/debian/patches/series
@@ -1,4 +1,3 @@
disable-doctest
no-bytestring-builder
disable-tests-with-external-test-cases
-stop-using-memcpy
diff --git a/p/haskell-http2/debian/patches/stop-using-memcpy b/p/haskell-http2/debian/patches/stop-using-memcpy
deleted file mode 100644
index c12dd16..0000000
--- a/p/haskell-http2/debian/patches/stop-using-memcpy
+++ /dev/null
@@ -1,55 +0,0 @@
-From e697e4ba7a957e9dea59cace57a97e3ad3bc7045 Mon Sep 17 00:00:00 2001
-From: Kazu Yamamoto <kazu at iij.ad.jp>
-Date: Wed, 16 Mar 2016 12:47:21 +0900
-Subject: [PATCH] stop using memcopy to copy an area to overlapped place. (#8)
-
----
- Network/HPACK/Buffer.hs | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/Network/HPACK/Buffer.hs b/Network/HPACK/Buffer.hs
-index c918094..d377dc4 100644
---- a/Network/HPACK/Buffer.hs
-+++ b/Network/HPACK/Buffer.hs
-@@ -71,16 +71,34 @@ writeWord8 WorkingBuffer{..} w = do
-
- {-# INLINE shiftLastN #-}
- shiftLastN :: WorkingBuffer -> Int -> Int -> IO ()
-+shiftLastN WorkingBuffer{..} 0 _ = return ()
- shiftLastN WorkingBuffer{..} i len = do
- ptr <- readIORef offset
-- let !src = ptr `plusPtr` negate len
-- !dst = src `plusPtr` i
-- !ptr' = ptr `plusPtr` i
-+ let !ptr' = ptr `plusPtr` i
- if ptr' >= limit then
- throwIO BufferOverrun
-+ else if i < 0 then do
-+ let !src = ptr `plusPtr` negate len
-+ !dst = src `plusPtr` i
-+ shiftLeft dst src len
-+ writeIORef offset ptr'
- else do
-- memcpy dst src len
-+ let !src = ptr `plusPtr` (-1)
-+ !dst = ptr' `plusPtr` (-1)
-+ shiftRight dst src len
- writeIORef offset ptr'
-+ where
-+ -- memcpy cannot be used for overlapped areas.
-+ shiftLeft :: Buffer -> Buffer -> Int -> IO ()
-+ shiftLeft _ _ 0 = return ()
-+ shiftLeft !dst !src n = do
-+ peek src >>= poke dst
-+ shiftLeft (dst `plusPtr` 1) (src `plusPtr` 1) (n - 1)
-+ shiftRight :: Buffer -> Buffer -> Int -> IO ()
-+ shiftRight _ _ 0 = return ()
-+ shiftRight !dst !src n = do
-+ peek src >>= poke dst
-+ shiftRight (dst `plusPtr` (-1)) (src `plusPtr` (-1)) (n - 1)
-
- {-# INLINE copyByteString #-}
- copyByteString :: WorkingBuffer -> ByteString -> IO ()
---
-2.7.0
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list