[Pkg-haskell-commits] darcs: ghc: Calculate haddock interface version using the built haddock, not the installed (Thanks to David Fox for noticing).

[Joachim Breitner]

Sun Jun  7 11:46:43 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Calculate haddock interface version using the built haddock, not the installed (Thanks to David Fox for noticing).

    M ./changelog +7
    M ./rules -2 +2

Sun Jun  7 11:46:43 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Calculate haddock interface version using the built haddock, not the installed (Thanks to David Fox for noticing).
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-06-07 11:47:15.601762723 +0000
+++ new-ghc/changelog	2015-06-07 11:47:15.609762724 +0000
@@ -1,3 +1,10 @@
+ghc (7.10.1-6) UNRELEASED; urgency=medium
+
+  * Calculate haddock interface version using the built haddock, not the
+    installed (Thanks to David Fox for noticing).
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 07 Jun 2015 13:46:18 +0200
+
 ghc (7.10.1-5) experimental; urgency=medium
 
   * Merge from unstable (Closes: #785282, #785194 )
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2015-06-07 11:47:15.601762723 +0000
+++ new-ghc/rules	2015-06-07 11:47:15.625762730 +0000
@@ -167,8 +167,8 @@
 	    echo 'ghci=ghc-ghci' >> debian/ghc.substvars ; fi
 
 	# Add haddock substvars
-	echo "haddock:Depends=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-doc.substvars
-	echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc.substvars
+	echo "haddock:Depends=haddock-interface-$$(debian/tmp/usr/lib/ghc/bin/haddock --interface-version)" >> debian/ghc-doc.substvars
+	echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/lib/ghc/bin/haddock --interface-version)" >> debian/ghc.substvars
 
 ifeq (YES,$(BUILD_HADDOCK_DOCS))
 	mkdir -p debian/tmp/usr/lib/ghc-doc