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

[Dmitry Bogatov]

Tue Feb 17 16:21:31 UTC 2015  Dmitry Bogatov <KAction at gnu.org>
  * New upstream release

    M ./changelog -1 +7
    M ./control -3 +4
    M ./patches/no-shakespeare-text -9 +30

Tue Feb 17 16:21:31 UTC 2015  Dmitry Bogatov <KAction at gnu.org>
  * New upstream release
diff -rN -u old-haskell-hledger/changelog new-haskell-hledger/changelog
--- old-haskell-hledger/changelog	2015-02-17 16:27:04.162538624 +0000
+++ new-haskell-hledger/changelog	2015-02-17 16:27:04.166538630 +0000
@@ -1,7 +1,13 @@
+haskell-hledger (0.24-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Dmitry Bogatov <KAction at gnu.org>  Sun, 11 Jan 2015 21:06:54 +0300
+
 haskell-hledger (0.23.3-2) experimental; urgency=medium
 
   * Depend on haskell-devscripts 0.9, found in experimental
-  * Patch: Avoid shakespeare-text 
+  * Patch: Avoid shakespeare-text
   * Do not depend on haskeline, which now comes with GHC
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 22 Dec 2014 13:21:12 +0100
diff -rN -u old-haskell-hledger/control new-haskell-hledger/control
--- old-haskell-hledger/control	2015-02-17 16:27:04.162538624 +0000
+++ new-haskell-hledger/control	2015-02-17 16:27:04.166538630 +0000
@@ -12,8 +12,8 @@
   , libghc-cmdargs-dev (>= 0.10)
   , libghc-cmdargs-dev (<< 0.11)
   , libghc-cmdargs-prof
-  , libghc-hledger-lib-dev (>= 0.23.3)
-  , libghc-hledger-lib-dev (<< 0.23.3+)
+  , libghc-hledger-lib-dev (>= 0.24)
+  , libghc-hledger-lib-dev (<< 0.24+)
   , libghc-hledger-lib-prof
   , libghc-hunit-dev
   , libghc-hunit-prof
@@ -61,7 +61,8 @@
   , libghc-tabular-doc
   , libghc-text-doc
   , libghc-utf8-string-doc
-Standards-Version: 3.9.5
+  , libghc-haskeline-doc
+Standards-Version: 3.9.6
 Homepage: http://hackage.haskell.org/package/hledger
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-hledger
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-hledger
diff -rN -u old-haskell-hledger/patches/no-shakespeare-text new-haskell-hledger/patches/no-shakespeare-text
--- old-haskell-hledger/patches/no-shakespeare-text	2015-02-17 16:27:04.162538624 +0000
+++ new-haskell-hledger/patches/no-shakespeare-text	2015-02-17 16:27:04.166538630 +0000
@@ -1,8 +1,15 @@
-Index: hledger-0.23.3/hledger.cabal
-===================================================================
---- hledger-0.23.3.orig/hledger.cabal	2014-12-21 23:01:34.267243696 +0100
-+++ hledger-0.23.3/hledger.cabal	2014-12-21 23:04:21.918557643 +0100
-@@ -90,8 +90,7 @@
+--- a/hledger.cabal
++++ b/hledger.cabal
+@@ -23,7 +23,7 @@ build-type:     Simple
+ -- data-dir:       data
+ -- data-files:
+ extra-tmp-files:
+-extra-source-files: 
++extra-source-files:
+                     tests/suite.hs
+                     CHANGES
+ 
+@@ -92,8 +92,7 @@ library
  -- and shakespeare. When you're ready to drop backwards compatibility,
  -- simply put a lower bound of >= 2.0 on shakespeare and remove the
  -- deprecated packages.
@@ -12,8 +19,8 @@
                   ,split >= 0.1 && < 0.3
                   ,text >= 0.11
                   ,tabular >= 0.2 && < 0.3
-@@ -151,8 +150,7 @@
-                  ,process
+@@ -134,8 +133,7 @@ executable hledger
+                  ,regex-tdfa
                   ,regexpr >= 0.5.1
                   ,safe >= 0.2
 -                 ,shakespeare-text >= 1.0 && < 1.2
@@ -22,8 +29,8 @@
                   ,split >= 0.1 && < 0.3
                   ,tabular >= 0.2 && < 0.3
                   ,text >= 0.11
-@@ -185,8 +183,7 @@
-                , process
+@@ -173,8 +171,7 @@ test-suite tests
+                , regex-tdfa
                 , regexpr
                 , safe
 -               , shakespeare-text >= 1.0 && < 1.2
@@ -32,3 +39,17 @@
                 , split
                 ,tabular >= 0.2 && < 0.3
                 , test-framework
+@@ -190,7 +187,7 @@ test-suite tests
+ -- not a standard cabal bench test, I think
+ benchmark bench
+   type:             exitcode-stdio-1.0
+-  -- hs-source-dirs:   
++  -- hs-source-dirs:
+   main-is:          ../tools/simplebench.hs
+   ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures
+   ghc-options: -fno-warn-type-defaults -fno-warn-orphans
+@@ -205,4 +202,3 @@ benchmark bench
+                     process,
+                     filepath,
+                     directory
+-