summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClint Adams <clint@debian.org>2013-11-23 07:06:48 +0400
committerClint Adams <clint@debian.org>2013-11-23 07:06:48 +0400
commitc06f008bea802f31fbbf73ee4c55cc076ef9cd7b (patch)
tree7cee7b3a69a74dc5a8150a2a9aa80db3f01236b7
parente0473b61852236868f9723b32dbe3e7b40cee7b1 (diff)
downloadDHG_packages-c06f008bea802f31fbbf73ee4c55cc076ef9cd7b.tar.gz
haskell-aeson: New upstream version 0.6.2.1.
-rw-r--r--p/haskell-aeson/debian/changelog8
-rw-r--r--p/haskell-aeson/debian/control4
-rw-r--r--p/haskell-aeson/debian/patches/threaded-option.diff12
3 files changed, 16 insertions, 8 deletions
diff --git a/p/haskell-aeson/debian/changelog b/p/haskell-aeson/debian/changelog
index d5c38fcde..d67f9c737 100644
--- a/p/haskell-aeson/debian/changelog
+++ b/p/haskell-aeson/debian/changelog
@@ -1,8 +1,12 @@
-haskell-aeson (0.6.1.0-4) UNRELEASED; urgency=low
+haskell-aeson (0.6.2.1-1) unstable; urgency=low
+ [ Joachim Breitner ]
* Adjust watch file to new hackage layout
- -- Joachim Breitner <nomeata@debian.org> Sat, 05 Oct 2013 18:19:30 +0200
+ [ Clint Adams ]
+ * New upstream version.
+
+ -- Clint Adams <clint@debian.org> Fri, 22 Nov 2013 21:56:51 -0500
haskell-aeson (0.6.1.0-3) unstable; urgency=low
diff --git a/p/haskell-aeson/debian/control b/p/haskell-aeson/debian/control
index e4c6fca00..f04d7e531 100644
--- a/p/haskell-aeson/debian/control
+++ b/p/haskell-aeson/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9)
, libghc-mtl-prof
, libghc-syb-dev
, libghc-syb-prof
- , libghc-dlist-dev
+ , libghc-dlist-dev (>= 0.2)
, libghc-dlist-prof
, libghc-text-dev (>> 0.11.0.2)
, libghc-text-prof
@@ -42,7 +42,7 @@ Build-Depends-Indep: ghc-doc
, libghc-text-doc
, libghc-unordered-containers-doc
, libghc-vector-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://hackage.haskell.org/package/aeson
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-aeson
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-aeson
diff --git a/p/haskell-aeson/debian/patches/threaded-option.diff b/p/haskell-aeson/debian/patches/threaded-option.diff
index 6b5866107..343da6d25 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
-@@ -101,6 +101,10 @@
+@@ -95,6 +95,10 @@
description: build TH bits
default: True
@@ -11,14 +11,18 @@
library
exposed-modules:
Data.Aeson
-@@ -152,7 +156,9 @@
- main-is: Properties.hs
+@@ -152,11 +156,13 @@
+ Properties.Deprecated
ghc-options:
- -Wall -threaded -rtsopts
+ -Wall -rtsopts
+ if impl(ghc < 7.4)
+ ghc-options: -fcontext-stack=40
+ if impl(ghc >= 7.2)
+ cpp-options: -DGHC_GENERICS
+ if flag(threaded)
-+ ghc-options: -threaded
++ ghc-options: -threaded
build-depends:
QuickCheck,