[Pkg-haskell-commits] darcs: haskell-authenticate-oauth: Depend on conduit-extra instead of blaze-builder-conduit

[Joachim Breitner]

Mon Dec 22 00:31:35 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Depend on conduit-extra instead of blaze-builder-conduit

    M ./changelog -2 +2
    M ./control +3
    A ./patches/
    A ./patches/no-blaze-builder-conduit
    A ./patches/series

Mon Dec 22 00:31:35 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Depend on conduit-extra instead of blaze-builder-conduit
diff -rN -u old-haskell-authenticate-oauth/changelog new-haskell-authenticate-oauth/changelog
--- old-haskell-authenticate-oauth/changelog	2014-12-22 13:28:52.529876758 +0000
+++ new-haskell-authenticate-oauth/changelog	2014-12-22 13:28:52.533876760 +0000
@@ -2,9 +2,9 @@
 
   * Depend on haskell-devscripts 0.9, found in experimental
   * New upstream release
-  * New upstream release
+  * Depend on conduit-extra instead of blaze-builder-conduit
 
- -- Joachim Breitner <nomeata at debian.org>  Mon, 22 Dec 2014 01:29:05 +0100
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 22 Dec 2014 01:29:06 +0100
 
 haskell-authenticate-oauth (1.4.0.8-2) unstable; urgency=medium
 
diff -rN -u old-haskell-authenticate-oauth/control new-haskell-authenticate-oauth/control
--- old-haskell-authenticate-oauth/control	2014-12-22 13:28:52.529876758 +0000
+++ new-haskell-authenticate-oauth/control	2014-12-22 13:28:52.529876758 +0000
@@ -21,6 +21,8 @@
   , libghc-blaze-builder-prof
   , libghc-conduit-dev (>= 0.4)
   , libghc-conduit-prof
+  , libghc-conduit-extra-dev
+  , libghc-conduit-extra-prof
   , libghc-crypto-pubkey-types-dev (>= 0.1)
   , libghc-crypto-pubkey-types-dev (<< 0.5)
   , libghc-crypto-pubkey-types-prof
@@ -38,6 +40,7 @@
   , libghc-base64-bytestring-doc
   , libghc-blaze-builder-doc
   , libghc-conduit-doc
+  , libghc-conduit-extra-prof
   , libghc-crypto-pubkey-types-doc
   , libghc-data-default-doc
   , libghc-http-client-doc
diff -rN -u old-haskell-authenticate-oauth/patches/no-blaze-builder-conduit new-haskell-authenticate-oauth/patches/no-blaze-builder-conduit
--- old-haskell-authenticate-oauth/patches/no-blaze-builder-conduit	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-authenticate-oauth/patches/no-blaze-builder-conduit	2014-12-22 13:28:52.533876760 +0000
@@ -0,0 +1,13 @@
+Index: authenticate-oauth-1.5.0.1/authenticate-oauth.cabal
+===================================================================
+--- authenticate-oauth-1.5.0.1.orig/authenticate-oauth.cabal	2014-12-22 01:29:42.518174861 +0100
++++ authenticate-oauth-1.5.0.1/authenticate-oauth.cabal	2014-12-22 01:30:39.031312589 +0100
+@@ -27,7 +27,7 @@
+                    , random
+                    , http-types                    >= 0.6
+                    , blaze-builder
+-                   , blaze-builder-conduit         >= 0.4
++                   , conduit-extra
+     exposed-modules: Web.Authenticate.OAuth, Web.Authenticate.OAuth.IO
+     ghc-options:     -Wall
+ 
diff -rN -u old-haskell-authenticate-oauth/patches/series new-haskell-authenticate-oauth/patches/series
--- old-haskell-authenticate-oauth/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-authenticate-oauth/patches/series	2014-12-22 13:28:52.533876760 +0000
@@ -0,0 +1 @@
+no-blaze-builder-conduit