[DHG_packages] 01/01: haskell-aeson: fix build by Adrian Bunk

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository DHG_packages.

commit 05ba15592cd43661e694f61a369bc13f532aa476
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jul 18 11:55:24 2017 +0200

    haskell-aeson: fix build by Adrian Bunk
---
 p/haskell-aeson/debian/changelog                    |  8 ++++++++
 p/haskell-aeson/debian/patches/th-option.diff       | 12 +++++++++---
 p/haskell-aeson/debian/patches/threaded-option.diff |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/p/haskell-aeson/debian/changelog b/p/haskell-aeson/debian/changelog
index 19301c5..27f69ba 100644
--- a/p/haskell-aeson/debian/changelog
+++ b/p/haskell-aeson/debian/changelog
@@ -1,3 +1,11 @@
+haskell-aeson (1.0.2.1-5) unstable; urgency=medium
+
+  [ Adrian Bunk <bunk at debian.org> ]
+  * Correct the patch th-options patch, the new release wrongly
+    refreshed it. This should fix the FTBFS (Closes: #867996)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 18 Jul 2017 11:48:41 +0200
+
 haskell-aeson (1.0.2.1-4) unstable; urgency=medium
 
   * Re-enable testsuite.
diff --git a/p/haskell-aeson/debian/patches/th-option.diff b/p/haskell-aeson/debian/patches/th-option.diff
index e6113fc..9784f6e 100644
--- a/p/haskell-aeson/debian/patches/th-option.diff
+++ b/p/haskell-aeson/debian/patches/th-option.diff
@@ -11,13 +11,19 @@
  library
    default-language: Haskell2010
  
-@@ -79,7 +83,8 @@
+@@ -79,12 +83,14 @@
      Data.Aeson.Parser
      Data.Aeson.Text
      Data.Aeson.Types
 -    Data.Aeson.TH
-+  if flag(th)
-+      exposed-modules: Data.Aeson.TH
  
      Data.Aeson.Encoding.Internal
      Data.Aeson.Internal
+     Data.Aeson.Internal.Time
+ 
++  if flag(th)
++      exposed-modules: Data.Aeson.TH
++
+   -- Deprecated modules
+   exposed-modules:
+     Data.Aeson.Encode
diff --git a/p/haskell-aeson/debian/patches/threaded-option.diff b/p/haskell-aeson/debian/patches/threaded-option.diff
index e6de2d9..91e7b8e 100644
--- a/p/haskell-aeson/debian/patches/threaded-option.diff
+++ b/p/haskell-aeson/debian/patches/threaded-option.diff
@@ -11,7 +11,7 @@
  library
    default-language: Haskell2010
  
-@@ -156,6 +160,10 @@
+@@ -157,6 +161,10 @@
    include-dirs: include
    c-sources:  cbits/unescape_string.c
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git