[Pkg-haskell-commits] darcs: haskell-hledger-web: New upstream release

[Joachim Breitner]

Tue Jun 23 10:35:57 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog -3 +4
    M ./control -18 +11
    M ./patches/no-network-conduit.diff -8 +10

Tue Jun 23 10:35:57 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-haskell-hledger-web/changelog new-haskell-hledger-web/changelog
--- old-haskell-hledger-web/changelog	2015-06-23 10:59:58.264642191 +0000
+++ new-haskell-hledger-web/changelog	2015-06-23 10:59:58.276642199 +0000
@@ -1,9 +1,10 @@
-haskell-hledger-web (0.23.3-2) UNRELEASED; urgency=medium
+haskell-hledger-web (0.24.1-1) UNRELEASED; urgency=medium
 
   * Depend on haskell-devscripts 0.9, found in experimental
   * Do not depend on transformers, which now comes with GHC
+  * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 20 Dec 2014 16:57:29 +0100
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 23 Jun 2015 12:33:47 +0200
 
 haskell-hledger-web (0.23.3-1) unstable; urgency=medium
 
diff -rN -u old-haskell-hledger-web/control new-haskell-hledger-web/control
--- old-haskell-hledger-web/control	2015-06-23 10:59:58.264642191 +0000
+++ new-haskell-hledger-web/control	2015-06-23 10:59:58.296642211 +0000
@@ -6,41 +6,34 @@
 Build-Depends: haskell-devscripts (>= 0.9)
   , ghc
   , ghc-ghci
-  , libghc-blaze-html-dev (>= 0.5)
-  , libghc-blaze-html-dev (<< 0.8)
-  , libghc-blaze-markup-dev (>= 0.5.1)
-  , libghc-blaze-markup-dev (<< 0.7)
+  , libghc-blaze-html-dev
+  , libghc-blaze-markup-dev
   , libghc-clientsession-dev
   , libghc-cmdargs-dev (>= 0.10)
   , libghc-cmdargs-dev (<< 0.11)
   , libghc-conduit-extra-dev
   , libghc-data-default-dev
-  , libghc-hamlet-dev
   , libghc-hjsmin-dev
-  , libghc-hledger-dev (>= 0.23.3)
-  , libghc-hledger-dev (<< 0.23.3+)
-  , libghc-hledger-lib-dev (>= 0.23.3)
-  , libghc-hledger-lib-dev (<< 0.23.3+)
-  , libghc-http-client-dev (>= 0.2)
-  , libghc-http-client-dev (<< 0.4)
+  , libghc-hledger-dev (>= 0.24)
+  , libghc-hledger-dev (<< 0.25)
+  , libghc-hledger-lib-dev (>= 0.24)
+  , libghc-hledger-lib-dev (<< 0.25)
+  , libghc-http-client-dev
   , libghc-http-conduit-dev
   , libghc-hunit-dev
   , libghc-json-dev
   , libghc-parsec3-dev
   , libghc-regexpr-dev (>= 0.5.1)
   , libghc-safe-dev (>= 0.2)
-  , libghc-shakespeare-dev (>= 1.0)
-  , libghc-shakespeare-dev (<< 2.1)
-  , libghc-shakespeare-text-dev (>= 1.0)
-  , libghc-shakespeare-text-dev (<< 1.2)
+  , libghc-shakespeare-dev (>= 2.0)
   , libghc-text-dev
   , libghc-wai-dev
   , libghc-wai-extra-dev
   , libghc-wai-handler-launch-dev (>= 1.3)
-  , libghc-warp-dev (>= 1.3)
+  , libghc-warp-dev
   , libghc-yaml-dev
-  , libghc-yesod-dev (>= 1.2)
-  , libghc-yesod-dev (<< 1.3)
+  , libghc-yesod-dev (>= 1.4)
+  , libghc-yesod-dev (<< 1.5)
   , libghc-yesod-core-dev
   , libghc-yesod-static-dev
   , libjs-jquery
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	2015-06-23 10:59:58.264642191 +0000
+++ new-haskell-hledger-web/patches/no-network-conduit.diff	2015-06-23 10:59:58.272642197 +0000
@@ -1,18 +1,20 @@
---- a/hledger-web.cabal
-+++ b/hledger-web.cabal
-@@ -127,7 +127,6 @@
+Index: hledger-web-0.24.1/hledger-web.cabal
+===================================================================
+--- hledger-web-0.24.1.orig/hledger-web.cabal	2015-06-23 12:35:51.293411272 +0200
++++ hledger-web-0.24.1/hledger-web.cabal	2015-06-23 12:35:51.289411182 +0200
+@@ -171,7 +171,6 @@
                     , http-conduit
-                    , http-client          >= 0.2 && < 0.4
+                    , http-client
                     , HUnit
 -                   , network-conduit
                     , conduit-extra
                     , old-locale
-                    , parsec
-@@ -227,7 +226,6 @@
+                    , parsec               >= 3
+@@ -242,7 +241,6 @@
                     , http-conduit
-                    , http-client          >= 0.2 && < 0.4
+                    , http-client
                     , HUnit
 -                   , network-conduit
                     , conduit-extra
                     , old-locale
-                    , parsec
+                    , parsec               >= 3