[Pkg-haskell-commits] darcs: haskell-hledger-chart: Tweak to build with newer chart and hledger.

[Clint Adams]

Sat Apr 21 14:03:53 UTC 2012  Clint Adams <clint at debian.org>
  * Tweak to build with newer chart and hledger.
  Ignore-this: fe68f69e51dc7fd66d39b4228332a0c

    M ./changelog +7
    M ./control -6 +6
    A ./patches/newer-chart.diff
    A ./patches/newer-hledger.diff
    M ./patches/series +2

Sat Apr 21 14:03:53 UTC 2012  Clint Adams <clint at debian.org>
  * Tweak to build with newer chart and hledger.
  Ignore-this: fe68f69e51dc7fd66d39b4228332a0c
diff -rN -u old-haskell-hledger-chart//changelog new-haskell-hledger-chart//changelog
--- old-haskell-hledger-chart//changelog	2012-04-21 14:03:57.989874889 +0000
+++ new-haskell-hledger-chart//changelog	2012-04-21 14:03:58.134920671 +0000
@@ -1,3 +1,10 @@
+haskell-hledger-chart (0.16.1-3) unstable; urgency=low
+
+  * Adjust for newer Chart.  closes: #669502.
+  * Bump to Standards-Version 3.9.3.
+
+ -- Clint Adams <clint at debian.org>  Sat, 21 Apr 2012 09:34:19 -0400
+
 haskell-hledger-chart (0.16.1-2) unstable; urgency=low
 
   * Adjust for newer cmdargs.  closes: #655790.
diff -rN -u old-haskell-hledger-chart//control new-haskell-hledger-chart//control
--- old-haskell-hledger-chart//control	2012-04-21 14:03:57.870288702 +0000
+++ new-haskell-hledger-chart//control	2012-04-21 14:03:58.139248447 +0000
@@ -7,16 +7,16 @@
   , ghc
   , ghc-prof
   , libghc-chart-dev (>> 0.11)
-  , libghc-chart-dev (<< 0.15)
+  , libghc-chart-dev (<< 0.16)
   , libghc-cmdargs-dev (>> 0.8)
   , libghc-cmdargs-dev (<< 0.10)
   , libghc-colour-dev
-  , libghc-hledger-dev (>> 0.16.1)
-  , libghc-hledger-dev (<< 0.16.2)
-  , libghc-hledger-lib-dev (>> 0.16.1)
-  , libghc-hledger-lib-dev (<< 0.16.2)
+  , libghc-hledger-dev (>> 0.17)
+  , libghc-hledger-dev (<< 0.17.1)
+  , libghc-hledger-lib-dev (>> 0.17)
+  , libghc-hledger-lib-dev (<< 0.17.1)
   , libghc-safe-dev (>> 0.2)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://hackage.haskell.org/package/hledger-chart
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-hledger-chart
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-hledger-chart
diff -rN -u old-haskell-hledger-chart//patches/newer-chart.diff new-haskell-hledger-chart//patches/newer-chart.diff
--- old-haskell-hledger-chart//patches/newer-chart.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hledger-chart//patches/newer-chart.diff	2012-04-21 14:03:58.139248447 +0000
@@ -0,0 +1,9 @@
+--- a/hledger-chart.cabal
++++ b/hledger-chart.cabal
+@@ -56,5 +56,5 @@
+                  -- ,split == 0.1.*
+                  ,time
+                  -- ,utf8-string >= 0.3.5 && < 0.4
+-                 ,Chart >= 0.11 && < 0.15
++                 ,Chart >= 0.11 && < 0.16
+                  ,colour
diff -rN -u old-haskell-hledger-chart//patches/newer-hledger.diff new-haskell-hledger-chart//patches/newer-hledger.diff
--- old-haskell-hledger-chart//patches/newer-hledger.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hledger-chart//patches/newer-hledger.diff	2012-04-21 14:03:58.139248447 +0000
@@ -0,0 +1,63 @@
+--- a/hledger-chart.cabal
++++ b/hledger-chart.cabal
+@@ -37,8 +37,8 @@
+                   Hledger.Chart.Main
+                   Hledger.Chart.Options
+   build-depends:
+-                  hledger == 0.16.1
+-                 ,hledger-lib == 0.16.1
++                  hledger >= 0.17 && < 0.18
++                 ,hledger-lib >= 0.17 && < 0.18
+                  ,HUnit
+                  ,base >= 3 && < 5
+                  ,cmdargs >= 0.8   && < 0.10
+--- a/Hledger/Chart/Options.hs
++++ b/Hledger/Chart/Options.hs
+@@ -8,11 +8,10 @@
+ import System.Console.CmdArgs
+ import System.Console.CmdArgs.Explicit
+ 
+-import Hledger.Cli hiding (progname,progversion)
+-import qualified Hledger.Cli (progname)
++import Hledger.Cli
+ 
+-progname = Hledger.Cli.progname ++ "-chart"
+-progversion = progversionstr progname
++progname = "hledger-chart"
++progversion = "0.16.1"
+ 
+ defchartoutput   = "hledger.png"
+ defchartitems    = 10
+--- a/Hledger/Chart/Main.hs
++++ b/Hledger/Chart/Main.hs
+@@ -21,16 +21,17 @@
+ import Text.Printf
+ 
+ import Hledger
+-import Hledger.Cli hiding (progname,progversion)
++import Hledger.Cli hiding (version)
+ import Prelude hiding (putStrLn)
+ import Hledger.Utils.UTF8 (putStrLn)
+ 
+ import Hledger.Chart.Options
++import Paths_hledger_chart
+ 
+ main :: IO ()
+ main = do
+   opts <- getHledgerChartOpts
+-  when (debug_ $ cliopts_ opts) $ printf "%s\n" progversion >> printf "opts: %s\n" (show opts)
++  when (debug_ $ cliopts_ opts) $ printf "%s\n" (show version) >> printf "opts: %s\n" (show opts)
+   runWith opts
+ 
+ runWith :: ChartOpts -> IO ()
+@@ -38,8 +39,8 @@
+     where
+       run opts
+           | "help" `in_` (rawopts_ $ cliopts_ opts)            = putStr (showModeHelp chartmode) >> exitSuccess
+-          | "version" `in_` (rawopts_ $ cliopts_ opts)         = putStrLn progversion >> exitSuccess
+-          | "binary-filename" `in_` (rawopts_ $ cliopts_ opts) = putStrLn (binaryfilename progname)
++          | "version" `in_` (rawopts_ $ cliopts_ opts)         = putStrLn (show version) >> exitSuccess
++          | "binary-filename" `in_` (rawopts_ $ cliopts_ opts) = putStrLn (binaryfilename "hledger-chart")
+           | otherwise                                          = withJournalDo' opts chart
+ 
+ withJournalDo' :: ChartOpts -> (ChartOpts -> Journal -> IO ()) -> IO ()
diff -rN -u old-haskell-hledger-chart//patches/series new-haskell-hledger-chart//patches/series
--- old-haskell-hledger-chart//patches/series	2012-04-21 14:03:57.682251773 +0000
+++ new-haskell-hledger-chart//patches/series	2012-04-21 14:03:58.139248447 +0000
@@ -1 +1,3 @@
 newer-cmdargs.diff
+newer-chart.diff
+newer-hledger.diff