[DHG_packages] 03/04: ghc: Backport upstream patch D1782 to unbreak manpage building

[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 f50aec8cef1d95f7bab97bcbf9f055ffaaecdb19
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Jan 15 13:21:15 2016 +0100

    ghc: Backport upstream patch D1782 to unbreak manpage building
---
 p/ghc/debian/changelog          |  1 +
 p/ghc/debian/patches/D1782.diff | 18 ++++++++++++++++++
 p/ghc/debian/patches/series     |  1 +
 3 files changed, 20 insertions(+)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 367d780..efb9727 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -7,6 +7,7 @@ ghc (8.0.0.20160111-1) experimental; urgency=medium
     + parc64-initial-platform-support
   * Configure haddock to use locally provided mathjax files, and let ghc-doc
     depend on libjs-mathjax.
+  * Backport upstream patch D1782 to unbreak manpage building
   * Add gpg key ot debian/upstream and use it in debian/watch
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 14 Jan 2016 16:16:37 +0100
diff --git a/p/ghc/debian/patches/D1782.diff b/p/ghc/debian/patches/D1782.diff
new file mode 100644
index 0000000..7fa1fd4
--- /dev/null
+++ b/p/ghc/debian/patches/D1782.diff
@@ -0,0 +1,18 @@
+Index: ghc/docs/users_guide/ghc.mk
+===================================================================
+--- ghc.orig/docs/users_guide/ghc.mk	2016-01-15 13:20:22.354615064 +0100
++++ ghc/docs/users_guide/ghc.mk	2016-01-15 13:20:22.350614982 +0100
+@@ -23,11 +23,11 @@
+ docs/users_guide_MAN_RST_SOURCES := docs/users_guide/ghc.rst
+ 
+ MAN_SECTION := 1
+-MAN_PAGES := docs/users_guide/ghc.1
++MAN_PAGES := docs/users_guide/build-man/ghc.1
+ 
+ ifneq "$(BINDIST)" "YES"
+ $(MAN_PAGES): $(docs/users_guide_MAN_RST_SOURCES) $(utils/mkUserGuidePart_GENERATED_RST_SOURCES)
+-	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide
++	$(SPHINXBUILD) -b man -d docs/users_guide/.doctrees-man docs/users_guide docs/users_guide/build-man
+ endif
+ 
+ man : $(MAN_PAGES)
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 6dad111..44464b1 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -4,3 +4,4 @@ no-missing-haddock-file-warning
 hurd.diff
 buildpath-abi-stability.patch
 reproducible-tmp-names
+D1782.diff

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