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

[Clint Adams]

Fri Mar  2 15:48:39 UTC 2012  Clint Adams <clint at debian.org>
  * New upstream version 0.17.
  Ignore-this: aa5f0a1f4ac0c0c39b090cac9dfd6a8a

    M ./changelog +9
    M ./control -7 +13
    R ./patches/newer-cmdargs.diff
    R ./patches/nonthreaded-runtime.diff
    R ./patches/series

Fri Mar  2 15:48:39 UTC 2012  Clint Adams <clint at debian.org>
  * New upstream version 0.17.
  Ignore-this: aa5f0a1f4ac0c0c39b090cac9dfd6a8a
diff -rN -u old-haskell-hledger//changelog new-haskell-hledger//changelog
--- old-haskell-hledger//changelog	2012-03-02 15:48:47.895247362 +0000
+++ new-haskell-hledger//changelog	2012-03-02 15:48:47.899249819 +0000
@@ -1,3 +1,12 @@
+haskell-hledger (0.17-1) unstable; urgency=low
+
+  * New upstream version.
+    - Drop non-threaded runtime patch (merged upstream).
+    - Drop newer cmdargs patch (merged upstream).
+  * Bump to Standards-Version 3.9.3.
+
+ -- Clint Adams <clint at debian.org>  Fri, 02 Mar 2012 10:25:40 -0500
+
 haskell-hledger (0.16.1-4) unstable; urgency=low
 
   * Fix to work with cmdargs 0.9.
diff -rN -u old-haskell-hledger//control new-haskell-hledger//control
--- old-haskell-hledger//control	2012-03-02 15:48:47.883248601 +0000
+++ new-haskell-hledger//control	2012-03-02 15:48:47.903249449 +0000
@@ -8,21 +8,25 @@
   , haskell-devscripts (>= 0.8)
   , ghc
   , ghc-prof
-  , libghc-cmdargs-dev (>> 0.9)
+  , libghc-cabal-file-th-dev
+  , libghc-cabal-file-th-prof
+  , libghc-cmdargs-dev (>> 0.9.1)
   , libghc-cmdargs-dev (<< 0.10)
   , libghc-cmdargs-prof
-  , libghc-containers-dev
-  , libghc-containers-prof
   , libghc-csv-dev
   , libghc-csv-prof
   , libghc-haskeline-dev (>> 0.6)
   , libghc-haskeline-dev (<< 0.7)
   , libghc-haskeline-prof
-  , libghc-hledger-lib-dev (>> 0.16.1)
-  , libghc-hledger-lib-dev (<< 0.16.2)
+  , libghc-hledger-lib-dev (>> 0.17)
+  , libghc-hledger-lib-dev (<< 0.17-999)
   , libghc-hledger-lib-prof
   , libghc-hunit-dev
   , libghc-hunit-prof
+  , libghc-mtl-dev
+  , libghc-mtl-prof
+  , libghc-parsec3-dev
+  , libghc-parsec3-prof
   , libghc-regexpr-dev (>> 0.5.1)
   , libghc-regexpr-prof
   , libghc-safe-dev (>> 0.2)
@@ -34,17 +38,19 @@
   , libghc-utf8-string-dev (<< 0.4)
   , libghc-utf8-string-prof
 Build-Depends-Indep: ghc-doc
+  , libghc-cabal-file-th-doc
   , libghc-cmdargs-doc
-  , libghc-containers-doc
   , libghc-csv-doc
   , libghc-haskeline-doc
   , libghc-hledger-lib-doc
   , libghc-hunit-doc
+  , libghc-mtl-doc
+  , libghc-parsec3-doc
   , libghc-regexpr-doc
   , libghc-safe-doc
   , libghc-split-doc
   , libghc-utf8-string-doc
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 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/newer-cmdargs.diff new-haskell-hledger//patches/newer-cmdargs.diff
--- old-haskell-hledger//patches/newer-cmdargs.diff	2012-03-02 15:48:47.806248986 +0000
+++ new-haskell-hledger//patches/newer-cmdargs.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
---- a/hledger.cabal
-+++ b/hledger.cabal
-@@ -64,7 +64,7 @@
-                   hledger-lib == 0.16.1
-                  ,base >= 3 && < 5
-                  ,containers
--                 ,cmdargs >= 0.8   && < 0.9
-+                 ,cmdargs >= 0.8   && < 0.10
-                  ,csv
-                  ,directory
-                  ,filepath
-@@ -116,7 +116,7 @@
-                   hledger-lib == 0.16.1
-                  ,base >= 3 && < 5
-                  ,containers
--                 ,cmdargs >= 0.8   && < 0.9
-+                 ,cmdargs >= 0.8   && < 0.10
-                  ,csv
-                  ,directory
-                  ,filepath
---- a/Hledger/Cli/Options.hs
-+++ b/Hledger/Cli/Options.hs
-@@ -445,7 +445,7 @@
-             alias' = case alias of ('=':rest) -> rest
-                                    _ -> orig
- 
--showModeHelp = showText defaultWrap . helpText HelpFormatDefault
-+showModeHelp = showText defaultWrap . helpText [] HelpFormatDefault
- 
- tests_Hledger_Cli_Options = TestList
-  [
diff -rN -u old-haskell-hledger//patches/nonthreaded-runtime.diff new-haskell-hledger//patches/nonthreaded-runtime.diff
--- old-haskell-hledger//patches/nonthreaded-runtime.diff	2012-03-02 15:48:47.806248986 +0000
+++ new-haskell-hledger//patches/nonthreaded-runtime.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
---- a/hledger.cabal
-+++ b/hledger.cabal
-@@ -35,6 +35,10 @@
-   type:     darcs
-   location: http://joyful.com/repos/hledger
- 
-+flag threaded
-+    Description:   Build with support for multithreaded execution
-+    Default:       True
-+
- library
-   -- XXX should set patchlevel here as in Makefile
-   cpp-options:    -DPATCHLEVEL=0
-@@ -104,8 +108,10 @@
-                   Hledger.Cli.Stats
-   -- XXX should set patchlevel here as in Makefile
-   cpp-options:    -DPATCHLEVEL=0
--  ghc-options:    -threaded -W
--  -- should be the same as above
-+  ghc-options:    -W
-+  if flag(threaded)
-+       ghc-options:   -threaded
-+ -- should be the same as above
-   build-depends:
-                   hledger-lib == 0.16.1
-                  ,base >= 3 && < 5
diff -rN -u old-haskell-hledger//patches/series new-haskell-hledger//patches/series
--- old-haskell-hledger//patches/series	2012-03-02 15:48:47.806248986 +0000
+++ new-haskell-hledger//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-nonthreaded-runtime.diff
-newer-cmdargs.diff