[Pkg-haskell-commits] darcs: haskell-aeson: New upstream version 0.6.2.1.

[Clint Adams]

Sat Nov 23 03:06:48 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 0.6.2.1.

    M ./changelog -2 +6
    M ./control -2 +2
    M ./patches/threaded-option.diff -4 +8

Sat Nov 23 03:06:48 UTC 2013  Clint Adams <clint at debian.org>
  * New upstream version 0.6.2.1.
diff -rN -u old-haskell-aeson/changelog new-haskell-aeson/changelog
--- old-haskell-aeson/changelog	2013-11-23 03:07:07.638670192 +0000
+++ new-haskell-aeson/changelog	2013-11-23 03:07:07.642670193 +0000
@@ -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 at debian.org>  Sat, 05 Oct 2013 18:19:30 +0200
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Fri, 22 Nov 2013 21:56:51 -0500
 
 haskell-aeson (0.6.1.0-3) unstable; urgency=low
 
diff -rN -u old-haskell-aeson/control new-haskell-aeson/control
--- old-haskell-aeson/control	2013-11-23 03:07:07.638670192 +0000
+++ new-haskell-aeson/control	2013-11-23 03:07:07.642670193 +0000
@@ -20,7 +20,7 @@
   , 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 @@
   , 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 -rN -u old-haskell-aeson/patches/threaded-option.diff new-haskell-aeson/patches/threaded-option.diff
--- old-haskell-aeson/patches/threaded-option.diff	2013-11-23 03:07:07.638670192 +0000
+++ new-haskell-aeson/patches/threaded-option.diff	2013-11-23 03:07:07.642670193 +0000
@@ -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,