hledger-lib: Upgrading from 1.0.1 to 1.1

3 files changed, 24 insertions, 6 deletions

diff --git a/p/haskell-hledger-lib/debian/changelog b/p/haskell-hledger-lib/debian/changelog
index bdbd206bb..b693ba49b 100644
--- a/p/haskell-hledger-lib/debian/changelog
+++ b/p/haskell-hledger-lib/debian/changelog
@@ -1,3 +1,9 @@
+haskell-hledger-lib (1.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Wed, 05 Jul 2017 22:04:15 -0400
+
 haskell-hledger-lib (1.0.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/haskell-hledger-lib/debian/control b/p/haskell-hledger-lib/debian/control
index 85a60af1c..5169bcef4 100644
--- a/p/haskell-hledger-lib/debian/control
+++ b/p/haskell-hledger-lib/debian/control
@@ -25,6 +25,8 @@ Build-Depends:
  libghc-hunit-prof,
  libghc-data-default-dev (>= 0.5),
  libghc-data-default-prof,
+ libghc-hashtables-dev (>= 1.2),
+ libghc-hashtables-prof,
  libghc-megaparsec-dev (>= 5.0),
  libghc-megaparsec-dev (<< 5.2),
  libghc-megaparsec-prof,
@@ -34,6 +36,8 @@ Build-Depends:
  libghc-old-time-prof,
  libghc-parsec3-dev,
  libghc-parsec3-prof,
+ libghc-parsers-dev (>= 0.5),
+ libghc-parsers-prof,
  libghc-pretty-show-dev (>= 1.6.4),
  libghc-pretty-show-prof,
  libghc-regex-tdfa-dev,
@@ -46,9 +50,13 @@ Build-Depends:
  libghc-split-dev (<< 0.3),
  libghc-split-dev (>= 0.1),
  libghc-split-prof,
+ libghc-system-filepath-dev,
+ libghc-system-filepath-prof,
  libghc-text-dev (>= 1.2),
  libghc-text-dev (<< 1.3),
  libghc-text-prof,
+ libghc-trifecta-dev (>= 0.91),
+ libghc-trifecta-prof,
  libghc-uglymemo-dev,
  libghc-uglymemo-prof,
  libghc-utf8-string-dev (<< 1.1),
@@ -63,16 +71,20 @@ Build-Depends-Indep:
  libghc-decimal-doc,
  libghc-hunit-doc,
  libghc-data-default-doc,
+ libghc-hashtables-doc,
  libghc-megaparsec-doc,
  libghc-mtl-doc,
  libghc-old-time-doc,
  libghc-parsec3-doc,
+ libghc-parsers-doc,
  libghc-pretty-show-doc,
  libghc-regex-tdfa-doc,
  libghc-safe-doc,
  libghc-semigroups-doc,
  libghc-split-doc,
+ libghc-system-filepath-doc,
  libghc-text-doc,
+ libghc-trifecta-doc,
  libghc-uglymemo-doc,
  libghc-utf8-string-doc,
 Standards-Version: 3.9.8
diff --git a/p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch b/p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch
index ecb044cb8..0fcbf1af5 100644
--- a/p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch
+++ b/p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch
@@ -1,23 +1,23 @@
 --- a/hledger-lib.cabal
 +++ b/hledger-lib.cabal
-@@ -70,7 +70,6 @@ library
-     , filepath
+@@ -74,7 +74,6 @@
+     , hashtables >= 1.2
      , megaparsec >=5.0 && < 5.2
      , mtl
 -    , mtl-compat
      , old-time
      , pretty-show >=1.6.4
      , regex-tdfa
-@@ -160,7 +159,6 @@ test-suite doctests
-     , filepath
+@@ -172,7 +171,6 @@
+     , hashtables >= 1.2
      , megaparsec >=5.0 && < 5.2
      , mtl
 -    , mtl-compat
      , old-time
      , pretty-show >=1.6.4
      , regex-tdfa
-@@ -200,7 +198,6 @@ test-suite hunittests
-     , filepath
+@@ -261,7 +259,6 @@
+     , hashtables >= 1.2
      , megaparsec >=5.0 && < 5.2
      , mtl
 -    , mtl-compat