[Pkg-haskell-commits] darcs: haskell-wai-app-file-cgi: staging conduit 1.1 transition

Clint Adams clint at debian.org
Tue Jun 10 13:59:53 UTC 2014


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

    M ./changelog -1 +7
    M ./control -12 +12
    R ./patches/data-default-class
    A ./patches/no-attoparsec-conduit.diff
    M ./patches/series -1 +1

Tue Jun 10 13:54:42 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition
diff -rN -u old-haskell-wai-app-file-cgi/changelog new-haskell-wai-app-file-cgi/changelog
--- old-haskell-wai-app-file-cgi/changelog	2014-06-10 13:59:52.933747786 +0000
+++ new-haskell-wai-app-file-cgi/changelog	2014-06-10 13:59:52.937747783 +0000
@@ -1,8 +1,14 @@
+haskell-wai-app-file-cgi (2.0.4-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sat, 07 Jun 2014 09:34:39 -0400
+
 haskell-wai-app-file-cgi (2.0.1-1) unstable; urgency=low
 
   * Adjust watch file to new hackage layout
   * New upstream release
-  * Patch it to be compatible with data-default-class 
+  * Patch it to be compatible with data-default-class
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 07 Mar 2014 18:43:48 +0100
 
diff -rN -u old-haskell-wai-app-file-cgi/control new-haskell-wai-app-file-cgi/control
--- old-haskell-wai-app-file-cgi/control	2014-06-10 13:59:52.933747786 +0000
+++ new-haskell-wai-app-file-cgi/control	2014-06-10 13:59:52.937747783 +0000
@@ -8,27 +8,27 @@
   , haskell-devscripts (>= 0.8.15)
   , ghc
   , ghc-prof
-  , libghc-attoparsec-dev (>> 0.10.0.0)
+  , libghc-attoparsec-dev (>= 0.10.0.0)
   , libghc-attoparsec-prof
-  , libghc-attoparsec-conduit-dev
-  , libghc-attoparsec-conduit-prof
   , libghc-blaze-builder-dev
   , libghc-blaze-builder-prof
   , libghc-blaze-html-dev
   , libghc-blaze-html-prof
   , libghc-case-insensitive-dev
   , libghc-case-insensitive-prof
-  , libghc-conduit-dev (>> 0.5)
+  , libghc-conduit-dev (>= 1.1)
   , libghc-conduit-prof
-  , libghc-data-default-dev
-  , libghc-data-default-prof
-  , libghc-http-client-dev
+  , libghc-conduit-extra-dev
+  , libghc-conduit-extra-prof
+  , libghc-data-default-class-dev
+  , libghc-data-default-class-prof
+  , libghc-http-client-dev (>= 0.3)
   , libghc-http-client-prof
-  , libghc-http-client-conduit-dev
-  , libghc-http-client-conduit-prof
+  , libghc-http-conduit-dev (>= 2.1)
+  , libghc-http-conduit-prof
   , libghc-http-date-dev
   , libghc-http-date-prof
-  , libghc-http-types-dev (>> 0.7)
+  , libghc-http-types-dev (>= 0.7)
   , libghc-http-types-prof
   , libghc-io-choice-dev
   , libghc-io-choice-prof
@@ -46,7 +46,7 @@
   , libghc-text-prof
   , libghc-transformers-dev
   , libghc-transformers-prof
-  , libghc-wai-dev (>> 2.0)
+  , libghc-wai-dev (>= 2.0)
   , libghc-wai-prof
   , libghc-word8-dev
   , libghc-word8-prof
@@ -55,11 +55,11 @@
 #  , libghc-warp-dev
 Build-Depends-Indep: ghc-doc
   , libghc-attoparsec-doc
-  , libghc-attoparsec-conduit-doc
   , libghc-blaze-builder-doc
   , libghc-blaze-html-doc
   , libghc-case-insensitive-doc
   , libghc-conduit-doc
+  , libghc-conduit-extra-doc
   , libghc-data-default-doc
   , libghc-http-client-doc
   , libghc-http-client-conduit-doc
diff -rN -u old-haskell-wai-app-file-cgi/patches/data-default-class new-haskell-wai-app-file-cgi/patches/data-default-class
--- old-haskell-wai-app-file-cgi/patches/data-default-class	2014-06-10 13:59:52.933747786 +0000
+++ new-haskell-wai-app-file-cgi/patches/data-default-class	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Index: haskell-wai-app-file-cgi-2.0.1/wai-app-file-cgi.cabal
-===================================================================
---- haskell-wai-app-file-cgi-2.0.1.orig/wai-app-file-cgi.cabal	2013-12-04 06:54:20.000000000 +0100
-+++ haskell-wai-app-file-cgi-2.0.1/wai-app-file-cgi.cabal	2014-03-07 18:41:10.003813148 +0100
-@@ -43,7 +43,7 @@
-                       , case-insensitive
-                       , conduit >= 0.5
-                       , containers
--                      , data-default
-+                      , data-default-class
-                       , directory
-                       , filepath
-                       , http-client
-Index: haskell-wai-app-file-cgi-2.0.1/Network/Wai/Application/Classic/RevProxy.hs
-===================================================================
---- haskell-wai-app-file-cgi-2.0.1.orig/Network/Wai/Application/Classic/RevProxy.hs	2013-12-04 06:54:20.000000000 +0100
-+++ haskell-wai-app-file-cgi-2.0.1/Network/Wai/Application/Classic/RevProxy.hs	2014-03-07 18:42:09.503810953 +0100
-@@ -10,7 +10,7 @@
- import qualified Data.ByteString as BS (uncons)
- import qualified Data.ByteString.Char8 as BS hiding (uncons)
- import Data.Conduit
--import Data.Default
-+import Data.Default.Class
- import qualified Network.HTTP.Client as H
- import qualified Network.HTTP.Client.Conduit as H
- import Network.HTTP.Types
-@@ -112,4 +112,4 @@
-     hdr = addServer cspec textPlainHeader
-     bdy = byteStringToBuilder "Bad Gateway\r\n"
-     st = badGateway502
---}
-\ No newline at end of file
-+-}
diff -rN -u old-haskell-wai-app-file-cgi/patches/no-attoparsec-conduit.diff new-haskell-wai-app-file-cgi/patches/no-attoparsec-conduit.diff
--- old-haskell-wai-app-file-cgi/patches/no-attoparsec-conduit.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-wai-app-file-cgi/patches/no-attoparsec-conduit.diff	2014-06-10 13:59:52.941747781 +0000
@@ -0,0 +1,10 @@
+--- a/wai-app-file-cgi.cabal
++++ b/wai-app-file-cgi.cabal
+@@ -36,7 +36,6 @@
+   Build-Depends:        base >= 4 && < 5
+                       , array
+                       , attoparsec >= 0.10.0.0
+-                      , attoparsec-conduit
+                       , blaze-builder
+                       , blaze-html
+                       , bytestring
diff -rN -u old-haskell-wai-app-file-cgi/patches/series new-haskell-wai-app-file-cgi/patches/series
--- old-haskell-wai-app-file-cgi/patches/series	2014-06-10 13:59:52.929747789 +0000
+++ new-haskell-wai-app-file-cgi/patches/series	2014-06-10 13:59:52.941747781 +0000
@@ -1 +1 @@
-data-default-class
+no-attoparsec-conduit.diff




More information about the Pkg-haskell-commits mailing list