[Pkg-haskell-commits] darcs: haskell-http-conduit: staging conduit 1.1 transition

[Clint Adams]

Tue Jun 10 13:54:34 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition

    M ./changelog +6
    M ./control -15 +21
    A ./patches/
    A ./patches/no-network-conduit.diff
    A ./patches/series

Tue Jun 10 13:54:34 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition
diff -rN -u old-haskell-http-conduit/changelog new-haskell-http-conduit/changelog
--- old-haskell-http-conduit/changelog	2014-06-10 13:56:07.721900364 +0000
+++ new-haskell-http-conduit/changelog	2014-06-10 13:56:07.721900364 +0000
@@ -1,3 +1,9 @@
+haskell-http-conduit (2.1.2.1-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Fri, 06 Jun 2014 09:45:06 -0400
+
 haskell-http-conduit (2.0.0.10-1) unstable; urgency=medium
 
   * New upstream release
diff -rN -u old-haskell-http-conduit/control new-haskell-http-conduit/control
--- old-haskell-http-conduit/control	2014-06-10 13:56:07.721900364 +0000
+++ new-haskell-http-conduit/control	2014-06-10 13:56:07.721900364 +0000
@@ -8,39 +8,44 @@
   , haskell-devscripts (>= 0.8.15)
   , ghc
   , ghc-prof
-  , libghc-conduit-dev (>> 0.5.5)
-  , libghc-conduit-dev (<< 1.1)
+  , libghc-conduit-dev (>= 0.5.5)
+  , libghc-conduit-dev (<< 1.2)
   , libghc-conduit-prof
-  , libghc-http-client-dev (>> 0.2.3.1)
+  , libghc-http-client-dev (>= 0.3.2)
+  , libghc-http-client-dev (<< 0.4)
   , libghc-http-client-prof
-  , libghc-http-client-conduit-dev (<< 0.3)
-  , libghc-http-client-conduit-prof
   , libghc-http-client-tls-dev
   , libghc-http-client-tls-prof
   , libghc-http-types-dev (>= 0.7)
   , libghc-http-types-prof
   , libghc-lifted-base-dev (>= 0.1)
   , libghc-lifted-base-prof
-  , libghc-resourcet-dev (>> 0.3)
-  , libghc-resourcet-dev (<< 0.5)
+  , libghc-monad-control-dev
+  , libghc-monad-control-prof
+  , libghc-mtl-dev
+  , libghc-mtl-prof
+  , libghc-resourcet-dev (>= 1.1)
+  , libghc-resourcet-dev (<< 1.2)
   , libghc-resourcet-prof
-  , libghc-transformers-dev (>> 0.2)
+  , libghc-transformers-dev (>= 0.2)
   , libghc-transformers-prof
   , libghc-hunit-dev
   , libghc-hspec-dev (>= 1.3)
   , libghc-blaze-builder-dev
+  , libghc-conduit-extra-dev
+  , libghc-connection-dev (>= 0.2)
   , libghc-cookie-dev
   , libghc-case-insensitive-dev
   , libghc-data-default-class-dev
-  , libghc-http-client-multipart-dev
   , libghc-network-dev
-  , libghc-network-conduit-dev (>= 0.6)
+  , libghc-streaming-commons-dev
   , libghc-text-dev
   , libghc-utf8-string-dev
-  , libghc-wai-dev (>= 2.0)
-  , libghc-wai-dev (<< 2.2)
-  , libghc-warp-dev (>= 2.0)
-  , libghc-warp-dev (<< 2.2)
+  , libghc-wai-dev (>= 3.0)
+  , libghc-wai-dev (<< 3.1)
+  , libghc-wai-conduit-dev
+  , libghc-warp-dev (>= 3.0)
+  , libghc-warp-dev (<< 3.1)
   , libghc-warp-tls-dev
 # For the testsuite:
   , ca-certificates
@@ -48,10 +53,11 @@
 Build-Depends-Indep: ghc-doc
   , libghc-conduit-doc
   , libghc-http-client-doc
-  , libghc-http-client-conduit-doc
   , libghc-http-client-tls-doc
   , libghc-http-types-doc
   , libghc-lifted-base-doc
+  , libghc-monad-control-doc
+  , libghc-mtl-doc
   , libghc-resourcet-doc
   , libghc-transformers-doc
 Standards-Version: 3.9.5
diff -rN -u old-haskell-http-conduit/patches/no-network-conduit.diff new-haskell-http-conduit/patches/no-network-conduit.diff
--- old-haskell-http-conduit/patches/no-network-conduit.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-http-conduit/patches/no-network-conduit.diff	2014-06-10 13:56:07.721900364 +0000
@@ -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 -rN -u old-haskell-http-conduit/patches/series new-haskell-http-conduit/patches/series
--- old-haskell-http-conduit/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-http-conduit/patches/series	2014-06-10 13:56:07.721900364 +0000
@@ -0,0 +1 @@
+no-network-conduit.diff