[DHG_packages] 01/02: aeson: Fix rules to find ghci and the threaded RTS properly

[Daniel Silverstone]

This is an automated email from the git hooks/post-receive script.

dsilvers pushed a commit to branch master
in repository DHG_packages.

commit 490b6d3c2e91b446fb1127a2673a6f558728ae70
Author: Daniel Silverstone <dsilvers at digital-scurf.org>
Date:   Wed Aug 12 14:25:23 2015 +0200

    aeson: Fix rules to find ghci and the threaded RTS properly
---
 p/haskell-aeson/debian/changelog | 6 ++++++
 p/haskell-aeson/debian/rules     | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/p/haskell-aeson/debian/changelog b/p/haskell-aeson/debian/changelog
index b2277f2..245c597 100644
--- a/p/haskell-aeson/debian/changelog
+++ b/p/haskell-aeson/debian/changelog
@@ -1,3 +1,9 @@
+haskell-aeson (0.8.0.2-3) unstable; urgency=medium
+
+  * Fix tests for threading and template-haskell
+
+ -- Daniel Silverstone <dsilvers at digital-scurf.org>  Wed, 12 Aug 2015 14:10:50 +0200
+
 haskell-aeson (0.8.0.2-2) unstable; urgency=medium
 
   * Upload to unstable
diff --git a/p/haskell-aeson/debian/rules b/p/haskell-aeson/debian/rules
index 8a78032..585496a 100755
--- a/p/haskell-aeson/debian/rules
+++ b/p/haskell-aeson/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
-DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/lib/ghc/bin/ghci || echo --flags=-th)
-DEB_SETUP_GHC_CONFIGURE_ARGS += $(shell test -e /usr/lib/ghc/libHSrts_thr.a || echo --flags=-threaded)
-DEB_ENABLE_TESTS = $(shell test -e /usr/lib/ghc/bin/ghci && echo yes)
+DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/bin/ghci || echo --flags=-th)
+DEB_SETUP_GHC_CONFIGURE_ARGS += $(shell test -e /usr/lib/ghc/rts-1.0/libHSrts_thr.a || echo --flags=-threaded)
+DEB_ENABLE_TESTS = $(shell test -e /usr/bin/ghci && echo yes)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git