[Pkg-haskell-commits] darcs: haskell-hledger: Fix to work with cmdargs 0.9.

[Clint Adams]

Thu Jan  5 01:17:28 UTC 2012  Clint Adams <clint at debian.org>
  * Fix to work with cmdargs 0.9.
  Ignore-this: fb22e18a464efe274e83f3e0a16c4875

    M ./changelog +6
    M ./control -2 +2
    M ./patches/newer-cmdargs.diff +20

Thu Jan  5 01:17:28 UTC 2012  Clint Adams <clint at debian.org>
  * Fix to work with cmdargs 0.9.
  Ignore-this: fb22e18a464efe274e83f3e0a16c4875
diff -rN -u old-haskell-hledger//changelog new-haskell-hledger//changelog
--- old-haskell-hledger//changelog	2012-01-05 01:18:48.883673808 +0000
+++ new-haskell-hledger//changelog	2012-01-05 01:18:48.887676283 +0000
@@ -1,3 +1,9 @@
+haskell-hledger (0.16.1-4) unstable; urgency=low
+
+  * Fix to work with cmdargs 0.9.
+
+ -- Clint Adams <clint at debian.org>  Wed, 04 Jan 2012 14:05:41 -0500
+
 haskell-hledger (0.16.1-3) unstable; urgency=low
 
   * Fix threaded flag in cabal file.  closes: #654258.
diff -rN -u old-haskell-hledger//control new-haskell-hledger//control
--- old-haskell-hledger//control	2012-01-05 01:18:48.883673808 +0000
+++ new-haskell-hledger//control	2012-01-05 01:18:48.887676283 +0000
@@ -8,8 +8,8 @@
   , haskell-devscripts (>= 0.8)
   , ghc
   , ghc-prof
-  , libghc-cmdargs-dev (>> 0.8)
-  , libghc-cmdargs-dev (<< 0.9)
+  , libghc-cmdargs-dev (>> 0.9)
+  , libghc-cmdargs-dev (<< 0.10)
   , libghc-cmdargs-prof
   , libghc-containers-dev
   , libghc-containers-prof
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-01-05 01:18:48.883673808 +0000
+++ new-haskell-hledger//patches/newer-cmdargs.diff	2012-01-05 01:18:48.887676283 +0000
@@ -9,3 +9,23 @@
                   ,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
+  [