diff -pruN 1.6.0-1/debian/changelog 1.6.3-2/debian/changelog --- 1.6.0-1/debian/changelog 2021-09-20 20:07:16.000000000 +0000 +++ 1.6.3-2/debian/changelog 2022-08-04 09:35:07.000000000 +0000 @@ -1,3 +1,19 @@ +haskell-hledger-interest (1.6.3-2) unstable; urgency=medium + + * Patch for newer dependencies + + -- Ilias Tsitsimpis Thu, 04 Aug 2022 12:35:07 +0300 + +haskell-hledger-interest (1.6.3-1) unstable; urgency=medium + + [ Ilias Tsitsimpis ] + * Declare compliance with Debian policy 4.6.1 + + [ Clint Adams ] + * New upstream release + + -- Clint Adams Fri, 29 Jul 2022 17:23:20 -0400 + haskell-hledger-interest (1.6.0-1) unstable; urgency=medium * New upstream release diff -pruN 1.6.0-1/debian/control 1.6.3-2/debian/control --- 1.6.0-1/debian/control 2021-09-20 20:07:16.000000000 +0000 +++ 1.6.3-2/debian/control 2022-08-04 09:34:57.000000000 +0000 @@ -12,10 +12,10 @@ Build-Depends: haskell-devscripts (>= 0.13), libghc-decimal-dev, libghc-decimal-prof, - libghc-hledger-lib-dev (>= 1.19), - libghc-hledger-lib-dev (<< 1.20), + libghc-hledger-lib-dev (>= 1.23), + libghc-hledger-lib-dev (<< 1.26), libghc-hledger-lib-prof, -Standards-Version: 4.5.0 +Standards-Version: 4.6.1 Homepage: https://github.com/peti/hledger-interest Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-hledger-interest Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-hledger-interest] diff -pruN 1.6.0-1/debian/patches/newer-deps 1.6.3-2/debian/patches/newer-deps --- 1.6.0-1/debian/patches/newer-deps 1970-01-01 00:00:00.000000000 +0000 +++ 1.6.3-2/debian/patches/newer-deps 2022-08-04 09:34:19.000000000 +0000 @@ -0,0 +1,20 @@ +Index: b/hledger-interest.cabal +=================================================================== +--- a/hledger-interest.cabal ++++ b/hledger-interest.cabal +@@ -1,5 +1,6 @@ + Name: hledger-interest + Version: 1.6.3 ++x-revision: 2 + Synopsis: computes interest for a given account + License: BSD3 + License-file: LICENSE +@@ -119,7 +120,7 @@ Source-Repository head + Executable hledger-interest + default-language: Haskell2010 + Main-is: Main.hs +- Build-depends: base >= 3 && < 5, hledger-lib == 1.23.*, time, mtl, Cabal, Decimal, text ++ Build-depends: base >= 3 && < 5, hledger-lib >= 1.23 && < 1.26, time, mtl, Cabal, Decimal, text + other-modules: Hledger.Interest + Hledger.Interest.DayCountConvention + Hledger.Interest.Rate diff -pruN 1.6.0-1/debian/patches/series 1.6.3-2/debian/patches/series --- 1.6.0-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.6.3-2/debian/patches/series 2022-08-04 09:34:08.000000000 +0000 @@ -0,0 +1 @@ +newer-deps diff -pruN 1.6.0-1/Hledger/Interest.hs 1.6.3-2/Hledger/Interest.hs --- 1.6.0-1/Hledger/Interest.hs 2001-09-09 01:46:40.000000000 +0000 +++ 1.6.3-2/Hledger/Interest.hs 2001-09-09 01:46:40.000000000 +0000 @@ -53,7 +53,7 @@ processTransaction ts = do let posts = [ p | p <- tpostings ts, interestAcc == paccount p ] forM_ posts $ \p -> do bal <- gets balance - modify (\st -> st { balance = normaliseMixedAmountSquashPricesForDisplay (bal + pamount p) }) + modify (\st -> st { balance = bal + pamount p }) computeInterest :: Day -> Computer () computeInterest day = do @@ -89,7 +89,7 @@ mkTrans day days ratePerAnno = do } pTarget = nullposting { paccount = targetAcc - , pamount = Mixed [ a { aquantity = (aquantity a * ratePerAnno) / fromInteger perDayScalar * fromInteger days } | a <- amounts bal ] + , pamount = mixed [ a { aquantity = (aquantity a * ratePerAnno) / fromInteger perDayScalar * fromInteger days } | a <- amounts bal ] , ptype = RegularPosting , ptransaction = Just t } diff -pruN 1.6.0-1/hledger-interest.cabal 1.6.3-2/hledger-interest.cabal --- 1.6.0-1/hledger-interest.cabal 2001-09-09 01:46:40.000000000 +0000 +++ 1.6.3-2/hledger-interest.cabal 2001-09-09 01:46:40.000000000 +0000 @@ -1,5 +1,5 @@ Name: hledger-interest -Version: 1.6.0 +Version: 1.6.3 Synopsis: computes interest for a given account License: BSD3 License-file: LICENSE @@ -11,8 +11,8 @@ Build-type: Simple Cabal-version: >= 1.10 Extra-source-files: README.md Stability: stable -tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5 - , GHC == 8.8.4, GHC == 8.10.2 +tested-with: GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7 + Description: hledger-interest is a small command-line utility based on Simon @@ -119,7 +119,7 @@ Source-Repository head Executable hledger-interest default-language: Haskell2010 Main-is: Main.hs - Build-depends: base >= 3 && < 5, hledger-lib == 1.19.*, time, mtl, Cabal, Decimal, text + Build-depends: base >= 3 && < 5, hledger-lib == 1.23.*, time, mtl, Cabal, Decimal, text other-modules: Hledger.Interest Hledger.Interest.DayCountConvention Hledger.Interest.Rate diff -pruN 1.6.0-1/Main.hs 1.6.3-2/Main.hs --- 1.6.0-1/Main.hs 2001-09-09 01:46:40.000000000 +0000 +++ 1.6.3-2/Main.hs 2001-09-09 01:46:40.000000000 +0000 @@ -91,16 +91,16 @@ main = bracket (return ()) (\() -> hFlus when (null (optTargetAcc opts)) (commandLineError "required --target option is missing\n") when (isNothing (optDCC opts)) (commandLineError "no day counting convention specified\n") when (isNothing (optRate opts)) (commandLineError "no interest rate specified\n") - let ledgerInputOptions = definputopts { ignore_assertions_ = optIgnoreAssertions opts } + let ledgerInputOptions = definputopts { balancingopts_ = (balancingopts_ definputopts) { ignore_assertions_ = optIgnoreAssertions opts } } jnl' <- readJournalFiles ledgerInputOptions (reverse (optInput opts)) >>= either fail return interestAcc <- case args of [] -> commandLineError "required argument ACCOUNT is missing\n" - [acc] -> return acc + [acc] -> return $ T.pack acc _ -> commandLineError "only one interest ACCOUNT may be specified\n" let jnl = filterJournalTransactions (Acct (toRegex' interestAcc)) jnl' ts = sortOn tdate (jtxns jnl) cfg = Config - { interestAccount = T.pack interestAcc + { interestAccount = interestAcc , sourceAccount = T.pack (optSourceAcc opts) , targetAccount = T.pack (optTargetAcc opts) , dayCountConvention = fromJust (optDCC opts) @@ -114,4 +114,4 @@ main = bracket (return ()) (\() -> hFlus result | optVerbose opts = ts' ++ ts | otherwise = ts' - mapM_ (putStr . showTransactionUnelided) (sortOn tdate result) + mapM_ (putStr . T.unpack . showTransaction) (sortOn tdate result)