[DHG_packages] 01/04: ghc: Configure haddock to use locally provided mathjax files, and let ghc-doc depend on libjs-mathjax.

[Joachim Breitner]

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

nomeata pushed a commit to branch experimental
in repository DHG_packages.

commit f39de7c66b02c244e77dac69d11624363a110398
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Jan 14 23:53:01 2016 +0100

    ghc: Configure haddock to use locally provided mathjax files, and let ghc-doc depend on libjs-mathjax.
---
 p/ghc/debian/changelog | 2 ++
 p/ghc/debian/control   | 2 +-
 p/ghc/debian/rules     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index a7ce12c..95d33eb 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -5,6 +5,8 @@ ghc (8.0.0.20160111-1) experimental; urgency=medium
     + cabal-show-detail-direct
     + sh4-platform-detection-support
     + parc64-initial-platform-support
+  * Configure haddock to use locally provided mathjax files, and let ghc-doc
+    depend on libjs-mathjax.
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 14 Jan 2016 16:16:37 +0100
 
diff --git a/p/ghc/debian/control b/p/ghc/debian/control
index 5422af6..10e8f1e 100644
--- a/p/ghc/debian/control
+++ b/p/ghc/debian/control
@@ -90,7 +90,7 @@ Provides: ${provided-docs}
 Replaces: ghc6-doc (<< 7), libghc-terminfo-doc (<< 0.3.2.5-4), libghc-transformers-doc (<< 0.3.0.0-6), libghc-xhtml-doc (<< 3000.2.1-5)
 Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1)
 Breaks: libghc-terminfo-doc (<< 0.3.2.5-4), libghc-transformers-doc (<< 0.3.0.0-6), libghc-xhtml-doc (<< 3000.2.1-5)
-Depends: ${haddock:Depends}, ${misc:Depends}, perl
+Depends: ${haddock:Depends}, ${misc:Depends}, perl, libjs-mathjax
 Pre-Depends: dpkg (>= 1.16.1)
 Description: Documentation for the Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index 779d315..729116f 100755
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -50,6 +50,7 @@ override_dh_auto_configure:
 	dh_autoreconf perl -- boot
 	echo "SRC_HC_OPTS += -lffi -optl-pthread" >> mk/build.mk
 	echo "HADDOCK_DOCS := YES" >> mk/build.mk
+	echo "EXTRA_HADDOCK_OPTS += --mathjax=file:///usr/share/javascript/mathjax/MathJax.js" >> mk/build.mk
 	echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
 ifneq (,$(findstring $(DEB_HOST_ARCH), arm64 armel armhf))
 	echo "SRC_HC_OPTS     += -optl-B/usr/bin/ld.gold" >> mk/build.mk

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