[Pkg-haskell-commits] darcs: haskell-hledger-web: New upstream version 0.23.2.

[Clint Adams]

Sun Jun 15 17:46:15 UTC 2014  Clint Adams <clint at debian.org>
  * New upstream version 0.23.2.

    M ./changelog +6
    M ./control -5 +8
    M ./patches/newer-wai.diff -2 +2
    M ./patches/no-network-conduit.diff -40 +4

Sun Jun 15 17:46:15 UTC 2014  Clint Adams <clint at debian.org>
  * New upstream version 0.23.2.
diff -rN -u old-haskell-hledger-web/changelog new-haskell-hledger-web/changelog
--- old-haskell-hledger-web/changelog	2014-06-15 17:47:00.467499485 +0000
+++ new-haskell-hledger-web/changelog	2014-06-15 17:47:00.467499485 +0000
@@ -1,3 +1,9 @@
+haskell-hledger-web (0.23.2-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Sun, 15 Jun 2014 13:38:43 -0400
+
 haskell-hledger-web (0.22.6-2) unstable; urgency=medium
 
   * Patch for newer conduit and WAI.
diff -rN -u old-haskell-hledger-web/control new-haskell-hledger-web/control
--- old-haskell-hledger-web/control	2014-06-15 17:47:00.467499485 +0000
+++ new-haskell-hledger-web/control	2014-06-15 17:47:00.467499485 +0000
@@ -17,10 +17,10 @@
   , libghc-data-default-dev
   , libghc-hamlet-dev
   , libghc-hjsmin-dev
-  , libghc-hledger-dev (>= 0.22.2)
-  , libghc-hledger-dev (<< 0.22.2+)
-  , libghc-hledger-lib-dev (>= 0.22.2)
-  , libghc-hledger-lib-dev (<< 0.22.2+)
+  , libghc-hledger-dev (>= 0.23.2)
+  , libghc-hledger-dev (<< 0.23.2+)
+  , libghc-hledger-lib-dev (>= 0.23.2)
+  , libghc-hledger-lib-dev (<< 0.23.2+)
   , libghc-http-client-dev (>= 0.2)
   , libghc-http-client-dev (<< 0.4)
   , libghc-http-conduit-dev
@@ -29,7 +29,10 @@
   , libghc-parsec3-dev
   , libghc-regexpr-dev (>= 0.5.1)
   , libghc-safe-dev (>= 0.2)
-  , libghc-shakespeare-text-dev
+  , libghc-shakespeare-dev (>= 1.0)
+  , libghc-shakespeare-dev (<< 2.1)
+  , libghc-shakespeare-text-dev (>= 1.0)
+  , libghc-shakespeare-text-dev (<< 1.2)
   , libghc-text-dev
   , libghc-transformers-dev
   , libghc-wai-dev
diff -rN -u old-haskell-hledger-web/patches/newer-wai.diff new-haskell-hledger-web/patches/newer-wai.diff
--- old-haskell-hledger-web/patches/newer-wai.diff	2014-06-15 17:47:00.463499485 +0000
+++ new-haskell-hledger-web/patches/newer-wai.diff	2014-06-15 17:47:00.467499485 +0000
@@ -1,6 +1,6 @@
 --- a/hledger-web.cabal
 +++ b/hledger-web.cabal
-@@ -140,8 +140,8 @@
+@@ -149,8 +149,8 @@ library
                     , transformers
                     , wai
                     , wai-extra
@@ -11,7 +11,7 @@
                     , yaml
                     , yesod                >= 1.2 && < 1.3
                     , yesod-core
-@@ -232,8 +232,8 @@
+@@ -240,8 +240,8 @@ executable         hledger-web
                     , transformers
                     , wai
                     , wai-extra
diff -rN -u old-haskell-hledger-web/patches/no-network-conduit.diff new-haskell-hledger-web/patches/no-network-conduit.diff
--- old-haskell-hledger-web/patches/no-network-conduit.diff	2014-06-15 17:47:00.463499485 +0000
+++ new-haskell-hledger-web/patches/no-network-conduit.diff	2014-06-15 17:47:00.467499485 +0000
@@ -1,54 +1,18 @@
 --- a/hledger-web.cabal
 +++ b/hledger-web.cabal
-@@ -120,6 +120,7 @@
-                    , bytestring
-                    , clientsession
-                    , cmdargs              >= 0.10 && < 0.11
-+                   , conduit-extra
-                    , data-default
-                    , directory
-                    , filepath
-@@ -128,7 +129,6 @@
+@@ -127,7 +127,6 @@ library
                     , http-conduit
                     , http-client          >= 0.2 && < 0.4
                     , HUnit
 -                   , network-conduit
+                    , conduit-extra
                     , old-locale
                     , parsec
-                    , regexpr              >= 0.5.1
-@@ -212,6 +212,7 @@
-                    , bytestring
-                    , clientsession
-                    , cmdargs              >= 0.10 && < 0.11
-+                   , conduit-extra
-                    , data-default
-                    , directory
-                    , filepath
-@@ -220,7 +221,6 @@
+@@ -227,7 +226,6 @@ executable         hledger-web
                     , http-conduit
                     , http-client          >= 0.2 && < 0.4
                     , HUnit
 -                   , network-conduit
+                    , conduit-extra
                     , old-locale
                     , parsec
-                    , regexpr              >= 0.5.1
---- a/Hledger/Web/Main.hs
-+++ b/Hledger/Web/Main.hs
-@@ -15,7 +15,7 @@
- -- import Yesod.Default.Main   (defaultMain)
- import Settings            --  (parseExtra)
- import Application          (makeApplication)
--import Data.Conduit.Network (HostPreference(HostIPv4))
-+import Data.Conduit.Network ()
- import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
- import Network.Wai.Handler.Launch (runUrlPort)
- --
-@@ -63,7 +63,7 @@
-   app <- makeApplication opts j' AppConfig{appEnv = Development
-                                           ,appPort = p
-                                           ,appRoot = pack u
--                                          ,appHost = HostIPv4
-+                                          ,appHost = "*4"
-                                           ,appExtra = Extra "" Nothing
-                                           }
-   if server_ opts