hunk ./changelog 1
+ghc6 (13) unstable; urgency=low
+
+  * For haddock 2.2.2 we no longer need to pass the -B flag, and
+    furthermore we no longer need for ghc6-doc to depend on ghc6.
+
+ -- David Fox <dsf@seereason.com>  Wed, 20 Aug 2008 19:38:43 -0700
+
hunk ./haddock21.diff 26
---- ghc6/libraries/gen_contents_index~	2007-12-12 12:59:35.000000000 +0000
-+++ ghc6/libraries/gen_contents_index	2008-06-03 17:05:30.000000000 +0000
-@@ -22,6 +22,9 @@
- done
- 
- # Now create the combined contents and index pages
-+HADDOCK_VERSION=`haddock -V | sed -n 's/^Haddock version \([^ ,]*\).*$/\1/p'`
-+if dpkg --compare-versions $HADDOCK_VERSION ge 2.1; then HADDOCK_ARGS="$HADDOCK_ARGS -B `ghc --print-libdir`"; fi
-+
- haddock --gen-index --gen-contents -o . \
-         -t "Haskell Hierarchical Libraries" \
-         $HADDOCK_ARGS
hunk ./haddock21.diff 28
-@@ -42,10 +42,10 @@
+@@ -42,6 +42,6 @@
hunk ./haddock21.diff 36
--Depends: haddock (>= 0.8-2), ${shlibs:Depends}, ${misc:Depends}
-+Depends: haddock (>= 0.8-2), ghc6, ${shlibs:Depends}, ${misc:Depends}
- Description: Documentation for the Glasgow Haskell Compilation system
-  Version 6 of the Glorious Glasgow Haskell Compilation system (GHC).  GHC is
-  a compiler for Haskell98.