[Pkg-haskell-commits] darcs: haskell-happstack-server: Do not depend on ghc-ghci, but set the template_haskell flag accordingly

[Joachim Breitner]

Wed Jun 17 07:37:58 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Do not depend on ghc-ghci, but set the template_haskell flag accordingly 

    M ./changelog +6
    M ./control -1
    M ./rules -1 +6

Wed Jun 17 07:37:58 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Do not depend on ghc-ghci, but set the template_haskell flag accordingly 
diff -rN -u old-haskell-happstack-server/changelog new-haskell-happstack-server/changelog
--- old-haskell-happstack-server/changelog	2015-06-17 07:52:18.173260487 +0000
+++ new-haskell-happstack-server/changelog	2015-06-17 07:52:18.181260485 +0000
@@ -1,3 +1,9 @@
+haskell-happstack-server (7.3.9-5) UNRELEASED; urgency=medium
+
+  * Do not depend on ghc-ghci, but set the template_haskell flag accordingly 
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 17 Jun 2015 09:37:13 +0200
+
 haskell-happstack-server (7.3.9-4) unstable; urgency=medium
 
   * Depend on ghc-ghci, as it uses Template Haskell
diff -rN -u old-haskell-happstack-server/control new-haskell-happstack-server/control
--- old-haskell-happstack-server/control	2015-06-17 07:52:18.173260487 +0000
+++ new-haskell-happstack-server/control	2015-06-17 07:52:18.177260486 +0000
@@ -8,7 +8,6 @@
  haskell-devscripts (>= 0.9),
  cdbs,
  ghc,
- ghc-ghci,
  ghc-prof
  , libghc-base64-bytestring-dev (>= 1.0)
  , libghc-base64-bytestring-dev (<< 1.1)
diff -rN -u old-haskell-happstack-server/rules new-haskell-happstack-server/rules
--- old-haskell-happstack-server/rules	2015-06-17 07:52:18.173260487 +0000
+++ new-haskell-happstack-server/rules	2015-06-17 07:52:18.177260486 +0000
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell test -e /usr/bin/ghci || echo --flags=-template_haskell; exit 0)
+ifeq (0,$(shell ghc --info | grep -q 'Have interpreter.*YES'; echo $$?))
+DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=template_haskell
+else
+DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-template_haskell
+endif
 DEB_ENABLE_TESTS = yes
 
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk