[Pkg-haskell-commits] darcs: ghc: Link ghc-doc to haddock via virtual package "haddock-interface-<n>"

[Joachim Breitner]

Wed Mar 23 06:07:51 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Link ghc-doc to haddock via virtual package "haddock-interface-<n>"
  Ignore-this: d09109aa73c887f5cad1f29aa64afe3f

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

Wed Mar 23 06:07:51 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Link ghc-doc to haddock via virtual package "haddock-interface-<n>"
  Ignore-this: d09109aa73c887f5cad1f29aa64afe3f
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-03-23 07:55:06.712711511 +0000
+++ new-ghc/changelog	2011-03-23 07:55:06.744713197 +0000
@@ -1,6 +1,7 @@
 ghc (7.0.2-5) UNRELEASED; urgency=low
 
   * Build-Conflict with broken version of dash (See #618023)
+  * Link ghc-doc to haddock via virtual package "haddock-interface-<n>"
 
  -- Joachim Breitner <nomeata at debian.org>  Wed, 23 Mar 2011 10:17:58 +0530
 
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-03-23 07:55:06.712711511 +0000
+++ new-ghc/control	2011-03-23 07:55:06.744713197 +0000
@@ -68,7 +68,7 @@
 Provides: ghc6-doc, ${provided-docs}
 Replaces: ghc6-doc (<< 7)
 Conflicts: ghc6-doc (<< 7)
-Depends: ghc-haddock (= ${binary:Version}), ${misc:Depends}, perl
+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
  Haskell.
@@ -99,7 +99,7 @@
 
 Package: ghc-haddock
 Architecture: any
-Provides: haddock
+Provides: haddock, ${haddock:Provides}
 Conflicts: haddock
 Depends: ghc, ${misc:Depends}, ${shlibs:Depends}
 Homepage: http://www.haskell.org/haddock/
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-03-23 07:55:06.712711511 +0000
+++ new-ghc/rules	2011-03-23 07:55:06.736712776 +0000
@@ -182,6 +182,10 @@
 
 	ProjectVersion=$(ProjectVersion) $(MAKE) -f debian/scripts.mk all
 
+	# Add haddock substvars
+	echo "haddock:Depends=$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-doc.substvars
+	echo "haddock:Provides=$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars
+
 ifeq (YES,$(BUILD_HADDOCK_DOCS))
 	mkdir -p debian/tmp/usr/lib/ghc-doc
 	cp debian/gen_contents_index debian/tmp/usr/lib/ghc-doc/