[Pkg-haskell-commits] darcs: ghc: Put .haddock files of libraries shipped with GHC into /usr/lib/ghc-doc/haddock/ghc/<pkg> instead of /usr/lib/ghc-doc/haddock/<pkg>. This avoids overriding such a file if a -doc package of the same package and version is installed. Closes: #783863.

[Joachim Breitner]

Fri May  1 08:22:38 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Put .haddock files of libraries shipped with GHC into /usr/lib/ghc-doc/haddock/ghc/<pkg> instead of /usr/lib/ghc-doc/haddock/<pkg>. This avoids overriding such a file if a -doc package of the same package and version is installed. Closes: #783863.

    M ./changelog +5
    M ./control -2 +2
    M ./rules -4 +4

Fri May  1 08:22:38 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Put .haddock files of libraries shipped with GHC into /usr/lib/ghc-doc/haddock/ghc/<pkg> instead of /usr/lib/ghc-doc/haddock/<pkg>. This avoids overriding such a file if a -doc package of the same package and version is installed. Closes: #783863.
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-05-01 08:23:22.819088774 +0000
+++ new-ghc/changelog	2015-05-01 08:23:22.823088775 +0000
@@ -1,6 +1,11 @@
 ghc (7.8.4-4) UNRELEASED; urgency=medium
 
   * Apply hurd compatibility patch by Pino
+  * Put .haddock files of libraries shipped with GHC into
+    /usr/lib/ghc-doc/haddock/ghc/<pkg> instead of
+    /usr/lib/ghc-doc/haddock/<pkg>. This avoids overriding such a file if a
+    -doc package of the same package and version is installed.
+    Closes: #783863.
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 01 May 2015 08:18:51 +0200
 
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2015-05-01 08:23:22.819088774 +0000
+++ new-ghc/control	2015-05-01 08:23:22.827088776 +0000
@@ -73,8 +73,8 @@
 Architecture: all
 Suggests: haskell-doc
 Provides: ${provided-docs}
-Replaces: ghc6-doc (<< 7), libghc-binary-doc
-Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1), libghc-binary-doc, libghc-xhtml-doc
+Replaces: ghc6-doc (<< 7)
+Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1)
 Depends: ${haddock:Depends}, ${misc:Depends}, perl
 Pre-Depends: dpkg (>= 1.16.1)
 Description: Documentation for the Glasgow Haskell Compilation system
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2015-05-01 08:23:22.819088774 +0000
+++ new-ghc/rules	2015-05-01 08:23:22.839088779 +0000
@@ -167,7 +167,7 @@
 	rm debian/tmp/var/lib/ghc/package.conf.d/package.cache
 	chmod +x debian/provided_substvars
 	debian/provided_substvars
-	sed -ri 's,^haddock-interfaces: /.*?/libraries/,haddock-interfaces: /usr/lib/ghc-doc/haddock/,' debian/tmp/var/lib/ghc/package.conf.d/*.conf
+	sed -ri 's,^haddock-interfaces: /.*?/libraries/,haddock-interfaces: /usr/lib/ghc-doc/haddock/ghc/,' debian/tmp/var/lib/ghc/package.conf.d/*.conf
 
 	# Remove haddock as built within the ghc tree
 	rm -f debian/tmp/usr/bin/haddock \
@@ -193,10 +193,10 @@
 	mkdir -p debian/tmp/usr/lib/ghc-doc
 	cp debian/gen_contents_index debian/tmp/usr/lib/ghc-doc/
 	chmod +x debian/tmp/usr/lib/ghc-doc/gen_contents_index
-	mkdir debian/tmp/usr/lib/ghc-doc/haddock/
+	mkdir debian/tmp/usr/lib/ghc-doc/haddock/ghc/
 	for f in `find debian/tmp/usr/share/doc/ghc-doc/html/libraries/ -maxdepth 1 -mindepth 1 -type d`; do \
-	    mkdir debian/tmp/usr/lib/ghc-doc/haddock/`basename $$f` ; \
-	    mv $$f/*.haddock debian/tmp/usr/lib/ghc-doc/haddock/`basename $$f` ; done
+	    mkdir debian/tmp/usr/lib/ghc-doc/haddock/ghc/`basename $$f` ; \
+	    mv $$f/*.haddock debian/tmp/usr/lib/ghc-doc/haddock/ghc/`basename $$f` ; done
 	cd debian/tmp/usr/share/doc/ghc-doc/html/libraries/; ln -s ghc-$(ProjectVersion) ghc
 	install -Dm 644 debian/index.html debian/tmp/usr/share/doc/ghc-doc/index.html
 endif