[Pkg-haskell-commits] darcs: haskell-aeson: New upstream release

[Joachim Breitner]

Tue Dec 23 12:52:46 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog +6
    M ./control -1 +2
    M ./patches/th-option.diff -6 +8
    M ./patches/threaded-option.diff -15 +13

Tue Dec 23 12:52:46 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-haskell-aeson/changelog new-haskell-aeson/changelog
--- old-haskell-aeson/changelog	2014-12-23 13:06:33.431277908 +0000
+++ new-haskell-aeson/changelog	2014-12-23 13:06:33.435277910 +0000
@@ -1,3 +1,9 @@
+haskell-aeson (0.8.0.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 23 Dec 2014 13:45:43 +0100
+
 haskell-aeson (0.7.0.6-2) experimental; urgency=medium
 
   * Depend on haskell-devscripts 0.9, found in experimental
diff -rN -u old-haskell-aeson/control new-haskell-aeson/control
--- old-haskell-aeson/control	2014-12-23 13:06:33.431277908 +0000
+++ new-haskell-aeson/control	2014-12-23 13:06:33.431277908 +0000
@@ -21,12 +21,13 @@
   , libghc-syb-prof
   , libghc-dlist-dev (>= 0.2)
   , libghc-dlist-prof
-  , libghc-text-dev (>= 1.1)
+  , libghc-text-dev (>= 1.1.1.0)
   , libghc-text-prof
   , libghc-unordered-containers-dev (>= 0.2.3.0)
   , libghc-unordered-containers-prof
   , libghc-vector-dev (>= 0.7.1)
   , libghc-vector-prof
+  , libghc-hunit-dev
   , libghc-quickcheck2-dev
   , libghc-scientific-dev (>= 0.3.1)
   , libghc-scientific-dev (<< 0.4)
diff -rN -u old-haskell-aeson/patches/th-option.diff new-haskell-aeson/patches/th-option.diff
--- old-haskell-aeson/patches/th-option.diff	2014-12-23 13:06:33.431277908 +0000
+++ new-haskell-aeson/patches/th-option.diff	2014-12-23 13:06:33.435277910 +0000
@@ -1,7 +1,9 @@
---- a/aeson.cabal
-+++ b/aeson.cabal
-@@ -81,6 +81,10 @@
-   description: Use the new bytestring builder available in bytestring >= 0.10.4.0
+Index: aeson-0.8.0.2/aeson.cabal
+===================================================================
+--- aeson-0.8.0.2.orig/aeson.cabal	2014-12-23 13:51:42.483548266 +0100
++++ aeson-0.8.0.2/aeson.cabal	2014-12-23 13:51:42.483548266 +0100
+@@ -80,6 +80,10 @@
+                If true then depend on time < 1.5 together with old-locale.
    default: False
  
 +flag th
@@ -11,7 +13,7 @@
  library
    exposed-modules:
      Data.Aeson
-@@ -88,7 +92,8 @@
+@@ -87,7 +91,8 @@
      Data.Aeson.Generic
      Data.Aeson.Parser
      Data.Aeson.Types
@@ -20,4 +22,4 @@
 +      exposed-modules: Data.Aeson.TH
  
    other-modules:
-     Data.Aeson.Functions
+     Data.Aeson.Encode.ByteString
diff -rN -u old-haskell-aeson/patches/threaded-option.diff new-haskell-aeson/patches/threaded-option.diff
--- old-haskell-aeson/patches/threaded-option.diff	2014-12-23 13:06:33.431277908 +0000
+++ new-haskell-aeson/patches/threaded-option.diff	2014-12-23 13:06:33.435277910 +0000
@@ -1,6 +1,8 @@
---- a/aeson.cabal
-+++ b/aeson.cabal
-@@ -85,6 +85,10 @@
+Index: aeson-0.8.0.2/aeson.cabal
+===================================================================
+--- aeson-0.8.0.2.orig/aeson.cabal	2014-12-23 13:51:58.479832676 +0100
++++ aeson-0.8.0.2/aeson.cabal	2014-12-23 13:52:36.524513794 +0100
+@@ -84,6 +84,10 @@
    description: build TH bits
    default: True
  
@@ -11,18 +13,14 @@
  library
    exposed-modules:
      Data.Aeson
-@@ -156,11 +160,13 @@
-     Types
+@@ -132,6 +136,10 @@
+   ghc-options: -O2 -Wall
+   cpp-options: -DGENERICS
  
-   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
- 
-   build-depends:
-     QuickCheck,
++
++
+ test-suite tests
+   type:           exitcode-stdio-1.0
+   hs-source-dirs: tests