summaryrefslogtreecommitdiff
path: root/p/haskell-aeson
diff options
context:
space:
mode:
authorGianfranco Costamagna <costamagnagianfranco@yahoo.it>2017-07-18 11:55:24 +0200
committerGianfranco Costamagna <costamagnagianfranco@yahoo.it>2017-07-18 11:55:24 +0200
commit05ba15592cd43661e694f61a369bc13f532aa476 (patch)
tree6401d1f170d781cc785cc928fc144f36e4e0240d /p/haskell-aeson
parentec0949d4796c03599d8db6e8702482637a6efc5d (diff)
downloadDHG_packages-05ba15592cd43661e694f61a369bc13f532aa476.tar.gz
haskell-aeson: fix build by Adrian Bunk
Diffstat (limited to 'p/haskell-aeson')
-rw-r--r--p/haskell-aeson/debian/changelog8
-rw-r--r--p/haskell-aeson/debian/patches/th-option.diff12
-rw-r--r--p/haskell-aeson/debian/patches/threaded-option.diff2
3 files changed, 18 insertions, 4 deletions
diff --git a/p/haskell-aeson/debian/changelog b/p/haskell-aeson/debian/changelog
index 19301c5a4..27f69ba79 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@debian.org> ]
+ * Correct the patch th-options patch, the new release wrongly
+ refreshed it. This should fix the FTBFS (Closes: #867996)
+
+ -- Gianfranco Costamagna <locutusofborg@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 e6113fc3f..9784f6e58 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 e6de2d939..91e7b8e8f 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