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

[Clint Adams]

Wed Apr 30 18:46:46 UTC 2014  Clint Adams <clint at debian.org>
  * New upstream version 0.22.2.

    M ./changelog +6
    M ./control -11 +6
    R ./patches/regex-tdfa
    R ./patches/series

Wed Apr 30 18:46:46 UTC 2014  Clint Adams <clint at debian.org>
  * New upstream version 0.22.2.
diff -rN -u old-haskell-hledger-lib/changelog new-haskell-hledger-lib/changelog
--- old-haskell-hledger-lib/changelog	2014-04-30 18:47:10.002374530 +0000
+++ new-haskell-hledger-lib/changelog	2014-04-30 18:47:10.002374530 +0000
@@ -1,3 +1,9 @@
+haskell-hledger-lib (0.22.2-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Wed, 30 Apr 2014 14:36:01 -0400
+
 haskell-hledger-lib (0.22.1-1) unstable; urgency=low
 
   * New upstream release
diff -rN -u old-haskell-hledger-lib/control new-haskell-hledger-lib/control
--- old-haskell-hledger-lib/control	2014-04-30 18:47:10.002374530 +0000
+++ new-haskell-hledger-lib/control	2014-04-30 18:47:10.006374529 +0000
@@ -8,14 +8,11 @@
   , haskell-devscripts (>= 0.8.15)
   , ghc
   , ghc-prof
-  , libghc-cmdargs-dev (>> 0.10)
+  , libghc-cmdargs-dev (>= 0.10)
   , libghc-cmdargs-dev (<< 0.11)
   , libghc-cmdargs-prof
   , libghc-csv-dev
   , libghc-csv-prof
-  , libghc-data-pprint-dev (>= 0.2.3)
-  , libghc-data-pprint-dev (<< 0.3)
-  , libghc-data-pprint-prof
   , libghc-hunit-dev
   , libghc-hunit-prof
   , libghc-mtl-dev
@@ -26,24 +23,22 @@
   , libghc-pretty-show-prof
   , libghc-regex-tdfa-dev
   , libghc-regex-tdfa-prof
-  , libghc-regexpr-dev (>> 0.5.1)
+  , libghc-regexpr-dev (>= 0.5.1)
   , libghc-regexpr-prof
-  , libghc-safe-dev (>> 0.2)
+  , libghc-safe-dev (>= 0.2)
   , libghc-safe-prof
-  , libghc-split-dev (>> 0.1)
+  , libghc-split-dev (>= 0.1)
   , libghc-split-dev (<< 0.3)
   , libghc-split-prof
-  , libghc-transformers-dev (>> 0.2)
+  , libghc-transformers-dev (>= 0.2)
   , libghc-transformers-dev (<< 0.4)
   , libghc-transformers-prof
-  , libghc-utf8-string-dev (>> 0.3.5)
+  , libghc-utf8-string-dev (>= 0.3.5)
   , libghc-utf8-string-dev (<< 0.4)
   , libghc-utf8-string-prof
 Build-Depends-Indep: ghc-doc
   , libghc-cmdargs-doc
-  , libghc-data-pprint-doc
   , libghc-csv-doc
-  , libghc-data-pprint-doc
   , libghc-hunit-doc
   , libghc-mtl-doc
   , libghc-parsec3-doc
diff -rN -u old-haskell-hledger-lib/patches/regex-tdfa new-haskell-hledger-lib/patches/regex-tdfa
--- old-haskell-hledger-lib/patches/regex-tdfa	2014-04-30 18:47:09.998374530 +0000
+++ new-haskell-hledger-lib/patches/regex-tdfa	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-From 7f2ffe2e45e689a6f028f9dc23bee5dafa24f867 Mon Sep 17 00:00:00 2001
-From: Clint Adams <clint at debian.org>
-Date: Sat, 28 Dec 2013 13:31:58 -0500
-Subject: [PATCH] Use regex-tdfa instead of regex-compat-tdfa
-
----
- hledger-lib/Hledger/Utils.hs  | 6 +++---
- hledger-lib/hledger-lib.cabal | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/Hledger/Utils.hs
-+++ b/Hledger/Utils.hs
-@@ -51,7 +51,7 @@
- import Test.HUnit
- import Text.ParserCombinators.Parsec
- import Text.Printf
--import Text.Regex
-+import Text.Regex.TDFA
- import Text.RegexPR
- import Text.Show.Pretty
- -- import qualified Data.Map as Map
-@@ -246,10 +246,10 @@
- 
- -- regex-compat (regex-posix) functions that perform better than regexpr.
- regexMatchesRegexCompat :: String -> String -> Bool
--regexMatchesRegexCompat r = isJust . matchRegex (mkRegex r)
-+regexMatchesRegexCompat = flip (=~)
- 
- regexMatchesCIRegexCompat :: String -> String -> Bool
--regexMatchesCIRegexCompat r = isJust . matchRegex (mkRegexWithOpts r True False)
-+regexMatchesCIRegexCompat r = match (makeRegexOpts defaultCompOpt { multiline = True, caseSensitive = False, newSyntax = True } defaultExecOpt r)
- 
- -- lists
- 
---- a/hledger-lib.cabal
-+++ b/hledger-lib.cabal
-@@ -68,7 +68,7 @@
-                  ,old-time
-                  ,parsec
-                  ,pretty-show
--                 ,regex-compat-tdfa == 0.95.*
-+                 ,regex-tdfa
-                  ,regexpr >= 0.5.1
-                  ,safe >= 0.2
-                  ,split >= 0.1 && < 0.3
-@@ -100,7 +100,7 @@
-                , old-time
-                , parsec
-                , pretty-show
--               , regex-compat-tdfa
-+               , regex-tdfa
-                , regexpr
-                , safe
-                , split
diff -rN -u old-haskell-hledger-lib/patches/series new-haskell-hledger-lib/patches/series
--- old-haskell-hledger-lib/patches/series	2014-04-30 18:47:09.998374530 +0000
+++ new-haskell-hledger-lib/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-regex-tdfa