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

[Clint Adams]

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

    M ./changelog -1 +5
    M ./control -2 +8
    A ./patches/
    A ./patches/newer-conduit.diff
    A ./patches/series

Tue Jun 10 13:54:41 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition
diff -rN -u old-haskell-publicsuffixlist/changelog new-haskell-publicsuffixlist/changelog
--- old-haskell-publicsuffixlist/changelog	2014-06-10 13:59:35.185759711 +0000
+++ new-haskell-publicsuffixlist/changelog	2014-06-10 13:59:35.185759711 +0000
@@ -1,7 +1,11 @@
-haskell-publicsuffixlist (0.1-2) UNRELEASED; urgency=low
+haskell-publicsuffixlist (0.1-2) unstable; urgency=medium
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
 
+  [ Clint Adams ]
+  * Patch for newer conduit.
+
  -- Joachim Breitner <nomeata at debian.org>  Sat, 05 Oct 2013 18:21:23 +0200
 
 haskell-publicsuffixlist (0.1-1) unstable; urgency=low
diff -rN -u old-haskell-publicsuffixlist/control new-haskell-publicsuffixlist/control
--- old-haskell-publicsuffixlist/control	2014-06-10 13:59:35.185759711 +0000
+++ new-haskell-publicsuffixlist/control	2014-06-10 13:59:35.189759708 +0000
@@ -12,7 +12,9 @@
   , libghc-cereal-prof
   , libghc-data-default-dev
   , libghc-data-default-prof
-  , libghc-text-dev (>> 0.11)
+  , libghc-exceptions-dev
+  , libghc-exceptions-prof
+  , libghc-text-dev (>= 0.11)
   , libghc-text-prof
   , libghc-utf8-string-dev
   , libghc-utf8-string-prof
@@ -22,15 +24,19 @@
   , libghc-conduit-dev (>= 1.0.0)
   , libghc-conduit-dev (<= 2.0.0)
   , libghc-conduit-prof
+  , libghc-conduit-extra-dev
+  , libghc-conduit-extra-prof
   , libghc-hunit-dev
 Build-Depends-Indep: ghc-doc
   , libghc-cereal-doc
   , libghc-data-default-doc
+  , libghc-exceptions-doc
   , libghc-text-doc
   , libghc-utf8-string-doc
   , libghc-idna-doc
   , libghc-conduit-doc
-Standards-Version: 3.9.4
+  , libghc-conduit-extra-doc
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/publicsuffixlist
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-publicsuffixlist
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-publicsuffixlist
diff -rN -u old-haskell-publicsuffixlist/patches/newer-conduit.diff new-haskell-publicsuffixlist/patches/newer-conduit.diff
--- old-haskell-publicsuffixlist/patches/newer-conduit.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-publicsuffixlist/patches/newer-conduit.diff	2014-06-10 13:59:35.193759705 +0000
@@ -0,0 +1,64 @@
+--- a/publicsuffixlist.cabal
++++ b/publicsuffixlist.cabal
+@@ -22,6 +22,8 @@
+     build-depends: base       >= 4       && < 5
+                  , containers
+                  , data-default
++                 , exceptions
++                 , resourcet
+                  , bytestring >= 0.9
+                  , text       >= 0.11
+                  , utf8-string
+@@ -29,6 +31,7 @@
+     if flag(create)
+         build-depends: idna             >= 0.1.2 && < 1.0
+                      , conduit          >= 1.0.0 && < 2.0.0
++                     , conduit-extra
+     exposed-modules: Network.PublicSuffixList.Lookup
+                    , Network.PublicSuffixList.DataStructure
+     other-modules: Network.PublicSuffixList.Types
+@@ -46,6 +49,7 @@
+     build-depends: base     >= 4 && < 5
+                  , containers
+                  , data-default
++                 , resourcet
+                  , text     >= 0.11
+                  , HUnit
+                  , idna     >= 0.1.1   && < 1.0
+--- a/Network/PublicSuffixList/Create.hs
++++ b/Network/PublicSuffixList/Create.hs
+@@ -24,6 +24,7 @@
+ module Network.PublicSuffixList.Create (PublicSuffixListException, sink) where
+ 
+ import           Control.Exception
++import           Control.Monad.Catch (MonadThrow)
+ import qualified Data.ByteString      as BS
+ import qualified Data.Conduit         as C
+ import qualified Data.Conduit.List    as CL
+@@ -67,6 +68,6 @@
+ {-
+ Generate the opaque 'DataStructure'
+ -}
+-sink :: C.MonadThrow m => C.Sink BS.ByteString m DataStructure
++sink :: MonadThrow m => C.Sink BS.ByteString m DataStructure
+ sink = CT.decode CT.utf8 C.=$ CT.lines C.=$ CL.fold foldingFunction def
+ 
+--- a/Network/PublicSuffixList/DataStructure.hs
++++ b/Network/PublicSuffixList/DataStructure.hs
+@@ -5,6 +5,7 @@
+ 
+ module Network.PublicSuffixList.DataStructure (dataStructure) where
+ 
++import           Control.Monad.Trans.Resource (runResourceT)
+ import           Data.ByteString.Char8 ()
+ 
+ import Network.PublicSuffixList.Types
+@@ -29,7 +30,7 @@
+ dataStructure :: DataStructure
+ #if defined(RUNTIMELIST)
+ {-# NOINLINE dataStructure #-}
+-dataStructure = unsafePerformIO $ C.runResourceT $ sourceFile RUNTIMELIST C.$$ PSLC.sink
++dataStructure = unsafePerformIO $ runResourceT $ sourceFile RUNTIMELIST C.$$ PSLC.sink
+ #else
+ dataStructure = let Right ds = runGet getDataStructure serializedDataStructure in ds
+ 
diff -rN -u old-haskell-publicsuffixlist/patches/series new-haskell-publicsuffixlist/patches/series
--- old-haskell-publicsuffixlist/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-publicsuffixlist/patches/series	2014-06-10 13:59:35.193759705 +0000
@@ -0,0 +1 @@
+newer-conduit.diff