aeson: Upgrading from 0.11.3.0 to 1.0.2.1

6 files changed, 26 insertions, 33 deletions

diff --git a/p/haskell-aeson/debian/changelog b/p/haskell-aeson/debian/changelog
index 226cb56ca..448b66302 100644
--- a/p/haskell-aeson/debian/changelog
+++ b/p/haskell-aeson/debian/changelog
@@ -1,3 +1,9 @@
+haskell-aeson (1.0.2.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Thu, 06 Jul 2017 18:38:53 -0400
+
 haskell-aeson (0.11.3.0-2) unstable; urgency=medium
 
   * Fix path to libHSrts_thr.a.
diff --git a/p/haskell-aeson/debian/control b/p/haskell-aeson/debian/control
index 36ee11905..98b0c7bc0 100644
--- a/p/haskell-aeson/debian/control
+++ b/p/haskell-aeson/debian/control
@@ -13,8 +13,9 @@ Build-Depends:
  libghc-attoparsec-dev,
  libghc-attoparsec-dev (>= 0.13.0.1),
  libghc-attoparsec-prof,
- libghc-base-orphans-dev (<< 0.6),
- libghc-base-orphans-dev (>= 0.5.3),
+ libghc-base-compat-dev (>= 0.9.1),
+ libghc-base-compat-dev (<< 0.10),
+ libghc-base-compat-prof,
  libghc-dlist-dev (>= 0.2),
  libghc-dlist-prof,
  libghc-hashable-dev (>= 1.1.2.0),
@@ -24,14 +25,10 @@ Build-Depends:
  libghc-mtl-prof,
  libghc-quickcheck-instances-dev (>= 0.3.12),
  libghc-quickcheck2-dev,
+ libghc-scientific-dev (>= 0.3.4.7),
  libghc-scientific-dev (<< 0.4),
- libghc-scientific-dev (>= 0.3.1),
  libghc-scientific-prof,
- libghc-semigroups-dev (<< 0.19),
- libghc-semigroups-dev (>= 0.16.1),
- libghc-semigroups-prof,
- libghc-syb-dev,
- libghc-syb-prof,
+ libghc-tagged-dev (>= 0.8.3),
  libghc-tagged-dev (<< 0.9),
  libghc-tagged-dev (>= 0.8.3),
  libghc-tagged-prof,
@@ -41,7 +38,9 @@ Build-Depends:
  libghc-text-dev,
  libghc-text-dev (>= 1.1.1.0),
  libghc-text-prof,
- libghc-unordered-containers-dev,
+ libghc-time-locale-compat-dev (>= 0.1.1),
+ libghc-time-locale-compat-dev (<< 0.2),
+ libghc-time-locale-compat-prof,
  libghc-unordered-containers-dev (>= 0.2.5.0),
  libghc-unordered-containers-prof,
  libghc-vector-dev,
@@ -50,17 +49,16 @@ Build-Depends:
 Build-Depends-Indep:
  ghc-doc,
  libghc-attoparsec-doc,
+ libghc-base-compat-doc,
  libghc-dlist-doc,
  libghc-hashable-doc,
- libghc-mtl-doc,
  libghc-scientific-doc,
- libghc-semigroups-doc,
- libghc-syb-doc,
  libghc-tagged-doc,
  libghc-text-doc,
+ libghc-time-locale-compat-doc,
  libghc-unordered-containers-doc,
  libghc-vector-doc,
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: https://github.com/bos/aeson
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-aeson
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
diff --git a/p/haskell-aeson/debian/patches/no-fail b/p/haskell-aeson/debian/patches/no-fail
deleted file mode 100644
index 2cdcd64d8..000000000
--- a/p/haskell-aeson/debian/patches/no-fail
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/aeson.cabal
-+++ b/aeson.cabal
-@@ -103,7 +103,6 @@ library
-     containers,
-     deepseq,
-     dlist >= 0.2,
--    fail == 4.9.*,
-     ghc-prim >= 0.2,
-     hashable >= 1.1.2.0,
-     mtl,
diff --git a/p/haskell-aeson/debian/patches/series b/p/haskell-aeson/debian/patches/series
index 42b61d837..79ecbcd96 100644
--- a/p/haskell-aeson/debian/patches/series
+++ b/p/haskell-aeson/debian/patches/series
@@ -1,3 +1,2 @@
 th-option.diff
 threaded-option.diff
-no-fail
diff --git a/p/haskell-aeson/debian/patches/th-option.diff b/p/haskell-aeson/debian/patches/th-option.diff
index 4dd650b99..e6113fc3f 100644
--- a/p/haskell-aeson/debian/patches/th-option.diff
+++ b/p/haskell-aeson/debian/patches/th-option.diff
@@ -1,8 +1,8 @@
 --- a/aeson.cabal
 +++ b/aeson.cabal
-@@ -64,6 +64,10 @@ flag old-locale
-                If true then depend on time < 1.5 together with old-locale.
+@@ -70,6 +70,10 @@
    default: False
+   manual: False
  
 +flag th
 +  description: build TH bits
@@ -11,13 +11,13 @@
  library
    default-language: Haskell2010
  
-@@ -74,7 +78,8 @@ library
-     Data.Aeson.Internal.Time
+@@ -79,7 +83,8 @@
      Data.Aeson.Parser
+     Data.Aeson.Text
      Data.Aeson.Types
 -    Data.Aeson.TH
 +  if flag(th)
 +      exposed-modules: Data.Aeson.TH
  
-   other-modules:
-     Data.Aeson.Encode.Builder
+     Data.Aeson.Encoding.Internal
+     Data.Aeson.Internal
diff --git a/p/haskell-aeson/debian/patches/threaded-option.diff b/p/haskell-aeson/debian/patches/threaded-option.diff
index ed5191716..e6de2d939 100644
--- a/p/haskell-aeson/debian/patches/threaded-option.diff
+++ b/p/haskell-aeson/debian/patches/threaded-option.diff
@@ -1,6 +1,6 @@
 --- a/aeson.cabal
 +++ b/aeson.cabal
-@@ -68,6 +68,10 @@ flag th
+@@ -74,6 +74,10 @@
    description: build TH bits
    default: True
  
@@ -11,9 +11,9 @@
  library
    default-language: Haskell2010
  
-@@ -132,6 +136,10 @@ library
- 
+@@ -156,6 +160,10 @@
    include-dirs: include
+   c-sources:  cbits/unescape_string.c
  
 +  if flag(threaded)
 +    ghc-options: -threaded