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

[Clint Adams]

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

    M ./changelog -2 +6
    M ./control -7 +12
    A ./patches/newer-conduit.diff
    M ./patches/series +1

Tue Jun 10 13:54:38 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition
diff -rN -u old-haskell-process-conduit/changelog new-haskell-process-conduit/changelog
--- old-haskell-process-conduit/changelog	2014-06-10 13:57:59.901824020 +0000
+++ new-haskell-process-conduit/changelog	2014-06-10 13:57:59.901824020 +0000
@@ -1,8 +1,12 @@
-haskell-process-conduit (1.0.0.0-3) UNRELEASED; urgency=low
+haskell-process-conduit (1.1.0.0-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:21 +0200
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Fri, 06 Jun 2014 10:15:51 -0400
 
 haskell-process-conduit (1.0.0.0-2) unstable; urgency=low
 
diff -rN -u old-haskell-process-conduit/control new-haskell-process-conduit/control
--- old-haskell-process-conduit/control	2014-06-10 13:57:59.901824020 +0000
+++ new-haskell-process-conduit/control	2014-06-10 13:57:59.905824017 +0000
@@ -8,27 +8,32 @@
   , haskell-devscripts (>= 0.8.15)
   , ghc
   , ghc-prof
-  , libghc-conduit-dev (>> 1.0)
-  , libghc-conduit-dev (<< 1.1)
+  , libghc-conduit-dev (>= 1.1)
   , libghc-conduit-prof
-  , libghc-control-monad-loop-dev (>> 0.1)
+  , libghc-control-monad-loop-dev (>= 0.1)
   , libghc-control-monad-loop-dev (<< 0.2)
   , libghc-control-monad-loop-prof
-  , libghc-mtl-dev (>> 2.0)
+  , libghc-mtl-dev (>= 2.0)
   , libghc-mtl-prof
-  , libghc-shakespeare-text-dev (>> 1.0)
+  , libghc-resourcet-dev (>= 1.1)
+  , libghc-resourcet-prof
+  , libghc-shakespeare-dev
+  , libghc-shakespeare-prof
+  , libghc-shakespeare-text-dev (>= 1.0)
   , libghc-shakespeare-text-prof
   , ghc-ghci
-  , libghc-text-dev (>> 0.11)
+  , libghc-text-dev (>= 0.11)
   , libghc-text-prof
   , libghc-hspec-dev (>> 1.3)
 Build-Depends-Indep: ghc-doc
   , libghc-conduit-doc
   , libghc-control-monad-loop-doc
   , libghc-mtl-doc
+  , libghc-resourcet-doc
+  , libghc-shakespeare-doc
   , libghc-shakespeare-text-doc
   , libghc-text-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/process-conduit
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-process-conduit
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-process-conduit
diff -rN -u old-haskell-process-conduit/patches/newer-conduit.diff new-haskell-process-conduit/patches/newer-conduit.diff
--- old-haskell-process-conduit/patches/newer-conduit.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-process-conduit/patches/newer-conduit.diff	2014-06-10 13:57:59.909824014 +0000
@@ -0,0 +1,19 @@
+--- a/process-conduit.cabal
++++ b/process-conduit.cabal
+@@ -48,4 +48,6 @@
+                      , bytestring
+                      , hspec           >= 1.3
+                      , conduit
++                     , conduit-extra
+                      , process-conduit
++                     , resourcet
+--- a/test.hs
++++ b/test.hs
+@@ -3,6 +3,7 @@
+ import Data.Conduit.Process
+ import System.Process.QQ
+ 
++import Control.Monad.Trans.Resource (runResourceT)
+ import qualified Data.ByteString.Lazy.Char8 as L
+ import Data.Conduit
+ import qualified Data.Conduit.Binary as CB
diff -rN -u old-haskell-process-conduit/patches/series new-haskell-process-conduit/patches/series
--- old-haskell-process-conduit/patches/series	2014-06-10 13:57:59.897824022 +0000
+++ new-haskell-process-conduit/patches/series	2014-06-10 13:57:59.909824014 +0000
@@ -1 +1,2 @@
 testpath.diff
+newer-conduit.diff