[Pkg-haskell-commits] darcs: haskell-devscripts: Install .haddock files in version-agnostic path

[Joachim Breitner]

Fri Jun 17 15:53:05 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Install .haddock files in version-agnostic path
  Ignore-this: 5e0360fee1f9450b032abde34da889fb

    M ./debian/changelog +6
    M ./hlibrary.mk -1 +1

Fri Jun 17 15:53:05 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Install .haddock files in version-agnostic path
  Ignore-this: 5e0360fee1f9450b032abde34da889fb
diff -rN -u old-haskell-devscripts//debian/changelog new-haskell-devscripts//debian/changelog
--- old-haskell-devscripts//debian/changelog	2011-06-17 15:53:10.155778331 +0000
+++ new-haskell-devscripts//debian/changelog	2011-06-17 15:53:10.163782139 +0000
@@ -1,3 +1,9 @@
+haskell-devscripts (0.8.6) UNRELEASED; urgency=low
+
+  * Install .haddock files in version-agnostic path
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 17 Jun 2011 17:52:55 +0200
+
 haskell-devscripts (0.8.5) unstable; urgency=low
 
   * s/GHC6/GHC in GHC_VERSION, BUILD_GHC, DEB_SETUP_GHC_CONFIGURE_ARGS, but
diff -rN -u old-haskell-devscripts//hlibrary.mk new-haskell-devscripts//hlibrary.mk
--- old-haskell-devscripts//hlibrary.mk	2011-06-17 15:53:10.155778331 +0000
+++ new-haskell-devscripts//hlibrary.mk	2011-06-17 15:53:10.179780012 +0000
@@ -46,7 +46,7 @@
 # most likely you don't need to touch this one
 GHC6_VERSION = $(shell ghc --numeric-version)
 GHC_VERSION = $(shell ghc --numeric-version)
-DEB_HADDOCK_DIR ?= /usr/lib/ghc-$(GHC_VERSION)/haddock/$(CABAL_PACKAGE)-$(CABAL_VERSION)/
+DEB_HADDOCK_DIR ?= /usr/lib/ghc-doc/haddock/$(CABAL_PACKAGE)-$(CABAL_VERSION)/
 
 ifndef DEB_NO_IMPLICIT_HADDOCK_HYPERLINK
 DEB_HADDOCK_OPTS += --hyperlink-source