[Pkg-haskell-commits] [package-plan] 01/01: Update http-client, http-client-conduit, http-client-tls, http-conduit

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository package-plan.

commit 809df91b83908dcf1d2e195b9364599c3676fee6
Author: Clint Adams <clint at debian.org>
Date:   Mon Jul 14 16:17:05 2014 -0400

    Update http-client, http-client-conduit, http-client-tls, http-conduit
---
 packages.txt                                         |  8 ++++----
 patches/http-conduit/2.1.2.3/no-network-conduit.diff | 10 ++++++++++
 patches/http-conduit/2.1.2.3/series                  |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages.txt b/packages.txt
index 85effd2..033f9d2 100644
--- a/packages.txt
+++ b/packages.txt
@@ -332,10 +332,10 @@ html 1.0.1.2
 html-conduit 1.1.0.5
 HTTP 4000.2.17 notest
 http-attoparsec 0.1.0
-http-client 0.3.3
-http-client-conduit 0.2.0.1
-http-client-tls 0.2.1.1
-http-conduit 2.1.2.1
+http-client 0.3.4
+http-client-conduit 0.3.0 obsolete
+http-client-tls 0.2.1.2 notest
+http-conduit 2.1.2.3
 http-date 0.0.2 notest
 http-reverse-proxy 0.4.0.1 notest
 http-types 0.8.5
diff --git a/patches/http-conduit/2.1.2.3/no-network-conduit.diff b/patches/http-conduit/2.1.2.3/no-network-conduit.diff
new file mode 100644
index 0000000..3583da3
--- /dev/null
+++ b/patches/http-conduit/2.1.2.3/no-network-conduit.diff
@@ -0,0 +1,10 @@
+--- a/http-conduit.cabal
++++ b/http-conduit.cabal
+@@ -65,7 +65,6 @@
+                  , wai-conduit
+                  , http-types
+                  , cookie
+-                 , network-conduit >= 0.6
+                  , http-client
+                  , http-conduit
+                  , conduit-extra
diff --git a/patches/http-conduit/2.1.2.3/series b/patches/http-conduit/2.1.2.3/series
new file mode 100644
index 0000000..9626b40
--- /dev/null
+++ b/patches/http-conduit/2.1.2.3/series
@@ -0,0 +1 @@
+no-network-conduit.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git