[Pkg-haskell-commits] darcs: haskell-yesod-auth-oauth: 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 -2 +6
    M ./control -3 +3
    A ./patches/
    A ./patches/newer-yesod-auth.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-yesod-auth-oauth/changelog new-haskell-yesod-auth-oauth/changelog
--- old-haskell-yesod-auth-oauth/changelog	2014-06-10 13:59:38.133757729 +0000
+++ new-haskell-yesod-auth-oauth/changelog	2014-06-10 13:59:38.133757729 +0000
@@ -1,8 +1,12 @@
-haskell-yesod-auth-oauth (1.2.0-2) UNRELEASED; urgency=low
+haskell-yesod-auth-oauth (1.2.0-2) unstable; urgency=medium
 
+  [ Joachim Breitner ]
   * Adjust watch file to new hackage layout
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 05 Oct 2013 18:22:18 +0200
+  [ Clint Adams ]
+  * Patch for newer yesod-auth.
+
+ -- Clint Adams <clint at debian.org>  Tue, 10 Jun 2014 07:27:35 -0400
 
 haskell-yesod-auth-oauth (1.2.0-1) unstable; urgency=low
 
diff -rN -u old-haskell-yesod-auth-oauth/control new-haskell-yesod-auth-oauth/control
--- old-haskell-yesod-auth-oauth/control	2014-06-10 13:59:38.133757729 +0000
+++ new-haskell-yesod-auth-oauth/control	2014-06-10 13:59:38.133757729 +0000
@@ -17,8 +17,8 @@
                , libghc-transformers-dev (>> 0.2.2)
                , libghc-transformers-dev (<< 0.4)
                , libghc-transformers-prof
-               , libghc-yesod-auth-dev (>> 1.2)
-               , libghc-yesod-auth-dev (<< 1.3)
+               , libghc-yesod-auth-dev (>= 1.3)
+               , libghc-yesod-auth-dev (<< 1.4)
                , libghc-yesod-auth-prof
                , libghc-yesod-core-dev (>> 1.2)
                , libghc-yesod-core-dev (<< 1.3)
@@ -37,7 +37,7 @@
                      , libghc-yesod-core-doc
                      , libghc-yesod-form-doc
                      , libghc-lifted-base-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.yesodweb.com/
 
 Package: libghc-yesod-auth-oauth-dev
diff -rN -u old-haskell-yesod-auth-oauth/patches/newer-yesod-auth.diff new-haskell-yesod-auth-oauth/patches/newer-yesod-auth.diff
--- old-haskell-yesod-auth-oauth/patches/newer-yesod-auth.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-yesod-auth-oauth/patches/newer-yesod-auth.diff	2014-06-10 13:59:38.133757729 +0000
@@ -0,0 +1,22 @@
+--- a/yesod-auth-oauth.cabal
++++ b/yesod-auth-oauth.cabal
+@@ -23,7 +23,7 @@
+     build-depends:   authenticate-oauth      >= 1.4       && < 1.5
+                    , bytestring              >= 0.9.1.4
+                    , yesod-core              >= 1.2       && < 1.3
+-                   , yesod-auth              >= 1.2       && < 1.3
++                   , yesod-auth              >= 1.3       && < 1.4
+                    , text                    >= 0.7       && < 0.12
+                    , yesod-form              >= 1.3       && < 1.4
+                    , transformers            >= 0.2.2     && < 0.4
+--- a/Yesod/Auth/OAuth.hs
++++ b/Yesod/Auth/OAuth.hs
+@@ -72,7 +72,7 @@
+       master <- getYesod
+       accTok <- getAccessToken oauth reqTok (authHttpManager master)
+       creds  <- liftIO $ mkCreds accTok
+-      setCreds True creds
++      setCredsRedirect creds
+     dispatch _ _ = notFound
+     login tm = do
+         render <- getUrlRender
diff -rN -u old-haskell-yesod-auth-oauth/patches/series new-haskell-yesod-auth-oauth/patches/series
--- old-haskell-yesod-auth-oauth/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-yesod-auth-oauth/patches/series	2014-06-10 13:59:38.133757729 +0000
@@ -0,0 +1 @@
+newer-yesod-auth.diff