[Pkg-haskell-commits] darcs: ghc: Install .haddock files under /usr/lib/haddock, a path valid across ghc-versions.

[Joachim Breitner]

Wed Jun 15 15:30:32 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Install .haddock files under /usr/lib/haddock, a path valid across ghc-versions.
  Ignore-this: dd374acdac35d27c7e73df9a48bc74b3

    M ./changelog +2
    M ./control -1 +1
    A ./ghc-doc.dirs
    M ./ghc-doc.triggers.in +2
    M ./rules -4 +5

Wed Jun 15 15:30:32 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Install .haddock files under /usr/lib/haddock, a path valid across ghc-versions.
  Ignore-this: dd374acdac35d27c7e73df9a48bc74b3
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2011-06-15 20:23:53.735789199 +0000
+++ new-ghc//changelog	2011-06-15 20:23:53.739788613 +0000
@@ -1,6 +1,8 @@
 ghc (7.0.3-2) UNRELEASED; urgency=low
 
   * Mention correct haddock version in package description.
+  * Install .haddock files under /usr/lib/ghc-doc/haddock, a path valid across
+    ghc-versions. Also move them to the ghc-doc package.
 
  -- Joachim Breitner <nomeata at debian.org>  Sun, 10 Apr 2011 00:08:06 +0530
 
diff -rN -u old-ghc//control new-ghc//control
--- old-ghc//control	2011-06-15 20:23:53.735789199 +0000
+++ new-ghc//control	2011-06-15 20:23:53.739788613 +0000
@@ -65,7 +65,7 @@
 Suggests: haskell-doc
 Provides: ${provided-docs}
 Replaces: ghc6-doc (<< 7)
-Conflicts: ghc6-doc (<< 7)
+Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1)
 Depends: ${haddock:Depends}, ${misc:Depends}, perl
 Description: Documentation for the Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
diff -rN -u old-ghc//ghc-doc.dirs new-ghc//ghc-doc.dirs
--- old-ghc//ghc-doc.dirs	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//ghc-doc.dirs	2011-06-15 20:23:53.743789397 +0000
@@ -0,0 +1,4 @@
+# This is part of the haddock file work-around. By installing these directories
+# also in ghc-doc, we ensure that they are removed eventually by dpkg.
+/usr/lib/ghc-7.0.2/haddock
+/usr/lib/ghc-7.0.3/haddock
diff -rN -u old-ghc//ghc-doc.triggers.in new-ghc//ghc-doc.triggers.in
--- old-ghc//ghc-doc.triggers.in	2011-06-15 20:23:53.735789199 +0000
+++ new-ghc//ghc-doc.triggers.in	2011-06-15 20:23:53.747788488 +0000
@@ -3,4 +3,6 @@
 interest /usr/share/ghc-doc/ghc- at VERSION@/haddock
 interest /usr/share/ghc-doc/ghc- at VERSION@/desc
 interest /usr/lib/ghc-doc/haddock
+interest /usr/lib/ghc-7.0.2/haddock
+interest /usr/lib/ghc-7.0.3/haddock
 interest /usr/lib/ghc- at VERSION@/haddock
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2011-06-15 20:23:53.735789199 +0000
+++ new-ghc//rules	2011-06-15 20:23:53.763782411 +0000
@@ -164,7 +164,7 @@
 ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64))
 	echo 'ghci=ghc-ghci' >> debian/ghc.substvars
 endif
-	sed -ri 's,^haddock-interfaces: /.*?/libraries/,haddock-interfaces: /usr/lib/ghc-$(ProjectVersion)/haddock/,' debian/tmp/var/lib/ghc-$(ProjectVersion)/package.conf.d/*.conf
+	sed -ri 's,^haddock-interfaces: /.*?/libraries/,haddock-interfaces: /usr/lib/ghc-doc/haddock/,' debian/tmp/var/lib/ghc-$(ProjectVersion)/package.conf.d/*.conf
 
 	# Remove haddock as built within the ghc tree
 	rm -f debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/haddock \
@@ -195,10 +195,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-$(ProjectVersion)/haddock/
+	mkdir debian/tmp/usr/lib/ghc-doc/haddock/
 	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-$(ProjectVersion)/haddock/`basename $$f` ; \
-	    mv $$f/*.haddock debian/tmp/usr/lib/ghc-$(ProjectVersion)/haddock/`basename $$f` ; done
+	    mkdir debian/tmp/usr/lib/ghc-doc/haddock/`basename $$f` ; \
+	    mv $$f/*.haddock debian/tmp/usr/lib/ghc-doc/haddock/`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
@@ -326,6 +326,7 @@
 	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_installexamples -i
+	dh_installdirs -i
 	dh_install -i
 	dh_installmenu -i
 	dh_installman -i