haskell-aeson: New upstream version 0.6.0.0.

5 files changed, 51 insertions, 8 deletions

diff --git a/p/haskell-aeson/debian/changelog b/p/haskell-aeson/debian/changelog
index 092a3542c..7c4310ade 100644
--- a/p/haskell-aeson/debian/changelog
+++ b/p/haskell-aeson/debian/changelog
@@ -1,3 +1,9 @@
+haskell-aeson (0.6.0.0-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Mon, 30 Jan 2012 21:46:49 -0500
+
 haskell-aeson (0.3.2.11-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/p/haskell-aeson/debian/control b/p/haskell-aeson/debian/control
index f765b88a0..574e4031d 100644
--- a/p/haskell-aeson/debian/control
+++ b/p/haskell-aeson/debian/control
@@ -5,31 +5,41 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.or
 Uploaders: Clint Adams <clint@debian.org>
 Build-Depends: debhelper (>= 7)
   , cdbs
-  , haskell-devscripts (>= 0.8)
+  , haskell-devscripts (>= 0.8.10)
   , ghc
   , ghc-prof
-  , libghc-attoparsec-dev
+  , ghc-ghci [any-i386 any-amd64 sparc]
+  , libghc-attoparsec-dev (>> 0.8.6.1)
   , libghc-attoparsec-prof
-  , libghc-blaze-builder-dev
+  , libghc-blaze-builder-dev (>> 0.2.1.4)
   , libghc-blaze-builder-prof
-  , libghc-blaze-textual-dev (>> 0.2.0.2)
-  , libghc-blaze-textual-prof
-  , libghc-hashable-dev
+  , libghc-deepseq-dev
+  , libghc-deepseq-prof
+  , libghc-hashable-dev (>> 1.1.2.0)
   , libghc-hashable-prof
   , libghc-mtl-dev
   , libghc-mtl-prof
   , libghc-syb-dev
   , libghc-syb-prof
-  , libghc-unordered-containers-dev
+  , libghc-text-dev (>> 0.11.0.2)
+  , libghc-text-prof
+  , libghc-unordered-containers-dev (>> 0.1.3.0)
   , libghc-unordered-containers-prof
+  , libghc-vector-dev (>> 0.7.1)
+  , libghc-vector-prof
+  , libghc-quickcheck2-dev [any-i386 any-amd64 sparc]
+  , libghc-test-framework-dev [any-i386 any-amd64 sparc]
+  , libghc-test-framework-quickcheck2-dev [any-i386 any-amd64 sparc]
 Build-Depends-Indep: ghc-doc
   , libghc-attoparsec-doc
   , libghc-blaze-builder-doc
-  , libghc-blaze-textual-doc
+  , libghc-deepseq-doc
   , libghc-hashable-doc
   , libghc-mtl-doc
   , libghc-syb-doc
+  , libghc-text-doc
   , libghc-unordered-containers-doc
+  , libghc-vector-doc
 Standards-Version: 3.9.2
 Homepage: http://hackage.haskell.org/package/aeson
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-aeson
diff --git a/p/haskell-aeson/debian/patches/series b/p/haskell-aeson/debian/patches/series
new file mode 100644
index 000000000..8a01abd36
--- /dev/null
+++ b/p/haskell-aeson/debian/patches/series
@@ -0,0 +1 @@
+th-option.diff
diff --git a/p/haskell-aeson/debian/patches/th-option.diff b/p/haskell-aeson/debian/patches/th-option.diff
new file mode 100644
index 000000000..2b574c4a2
--- /dev/null
+++ b/p/haskell-aeson/debian/patches/th-option.diff
@@ -0,0 +1,23 @@
+--- a/aeson.cabal
++++ b/aeson.cabal
+@@ -97,6 +97,10 @@
+   description: operate in developer mode
+   default: False
+
++flag th
++  description: build TH bits
++  default: True
++
+ library
+   exposed-modules:
+     Data.Aeson
+@@ -104,7 +108,8 @@
+     Data.Aeson.Generic
+     Data.Aeson.Parser
+     Data.Aeson.Types
+-    Data.Aeson.TH
++  if flag(th)
++      exposed-modules: Data.Aeson.TH
+
+   other-modules:
+     Data.Aeson.Functions
diff --git a/p/haskell-aeson/debian/rules b/p/haskell-aeson/debian/rules
index 683e77bcf..ce36673ee 100755
--- a/p/haskell-aeson/debian/rules
+++ b/p/haskell-aeson/debian/rules
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc/bin/ghci || echo --flags=-th)
+DEB_ENABLE_TESTS = $(shell test -e /usr/lib/ghc/bin/ghci && echo yes)
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk