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

[Clint Adams]

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

    M ./changelog +6
    M ./control -3 +3
    A ./patches/newer-fb.diff
    A ./patches/newer-http-conduit.diff
    M ./patches/series +2

Tue Jun 10 13:54:37 UTC 2014  Clint Adams <clint at debian.org>
  * staging conduit 1.1 transition
diff -rN -u old-haskell-happstack-authenticate/changelog new-haskell-happstack-authenticate/changelog
--- old-haskell-happstack-authenticate/changelog	2014-06-10 13:57:02.705862858 +0000
+++ new-haskell-happstack-authenticate/changelog	2014-06-10 13:57:02.709862854 +0000
@@ -1,3 +1,9 @@
+haskell-happstack-authenticate (0.10.12-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Fri, 06 Jun 2014 08:14:45 -0400
+
 haskell-happstack-authenticate (0.10.10-1) unstable; urgency=medium
 
   [ Colin Watson ]
diff -rN -u old-haskell-happstack-authenticate/control new-haskell-happstack-authenticate/control
--- old-haskell-happstack-authenticate/control	2014-06-10 13:57:02.705862858 +0000
+++ new-haskell-happstack-authenticate/control	2014-06-10 13:57:02.713862850 +0000
@@ -9,7 +9,7 @@
   , ghc
   , ghc-prof
   , libghc-acid-state-dev (>= 0.6)
-  , libghc-acid-state-dev (<< 0.13)
+  , libghc-acid-state-dev (<< 0.13.1)
   , libghc-acid-state-prof
   , libghc-aeson-dev (>= 0.4)
   , libghc-aeson-dev (<< 0.8)
@@ -21,13 +21,13 @@
   , libghc-blaze-html-dev (<< 0.8)
   , libghc-blaze-html-prof
   , libghc-fb-dev (>= 0.13)
-  , libghc-fb-dev (<< 0.16)
+  , libghc-fb-dev (<< 1.1)
   , libghc-fb-prof
   , libghc-happstack-server-dev (>= 6.0)
   , libghc-happstack-server-dev (<< 7.4)
   , libghc-happstack-server-prof
   , libghc-http-conduit-dev (>= 1.4)
-  , libghc-http-conduit-dev (<< 2.1)
+  , libghc-http-conduit-dev (<< 2.2)
   , libghc-http-conduit-prof
   , libghc-http-types-dev (>= 0.6)
   , libghc-http-types-dev (<< 0.9)
diff -rN -u old-haskell-happstack-authenticate/patches/newer-fb.diff new-haskell-happstack-authenticate/patches/newer-fb.diff
--- old-haskell-happstack-authenticate/patches/newer-fb.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-happstack-authenticate/patches/newer-fb.diff	2014-06-10 13:57:02.713862850 +0000
@@ -0,0 +1,18 @@
+--- a/happstack-authenticate.cabal
++++ b/happstack-authenticate.cabal
+@@ -41,7 +41,7 @@
+                        happstack-server             >= 6.0 && < 7.4,
+                        http-conduit                 >= 1.4 && < 2.1,
+                        http-types                   >= 0.6 && < 0.9,
+-                       fb                           >= 0.13 && < 0.16,
++                       fb                           >= 0.13 && < 1.1,
+                        safecopy                     >= 0.6,
+                        mtl                          >= 2.0,
+                        pwstore-fast,
+@@ -53,4 +53,4 @@
+                        reform-happstack             == 0.2.*,
+                        unordered-containers         == 0.2.*,
+                        web-routes                   >= 0.26 && < 0.28,
+-                       web-routes-happstack         == 0.23.*
+\ No newline at end of file
++                       web-routes-happstack         == 0.23.*
diff -rN -u old-haskell-happstack-authenticate/patches/newer-http-conduit.diff new-haskell-happstack-authenticate/patches/newer-http-conduit.diff
--- old-haskell-happstack-authenticate/patches/newer-http-conduit.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-happstack-authenticate/patches/newer-http-conduit.diff	2014-06-10 13:57:02.717862848 +0000
@@ -0,0 +1,11 @@
+--- a/happstack-authenticate.cabal
++++ b/happstack-authenticate.cabal
+@@ -39,7 +39,7 @@
+                        containers                   >= 0.4 && < 0.6,
+                        ixset                        >= 1.0 && < 1.1,
+                        happstack-server             >= 6.0 && < 7.4,
+-                       http-conduit                 >= 1.4 && < 2.1,
++                       http-conduit                 >= 1.4 && < 2.2,
+                        http-types                   >= 0.6 && < 0.9,
+                        fb                           >= 0.13 && < 1.1,
+                        safecopy                     >= 0.6,
diff -rN -u old-haskell-happstack-authenticate/patches/series new-haskell-happstack-authenticate/patches/series
--- old-haskell-happstack-authenticate/patches/series	2014-06-10 13:57:02.705862858 +0000
+++ new-haskell-happstack-authenticate/patches/series	2014-06-10 13:57:02.717862848 +0000
@@ -1 +1,3 @@
 faster-pwstore.diff
+newer-fb.diff
+newer-http-conduit.diff