--- haskell-devscripts-0.6.12.old/dh_haskell_prep	2008-03-22 20:28:43.000000000 +0000
+++ haskell-devscripts-0.6.12/dh_haskell_prep	2008-06-04 16:44:03.000000000 +0000
@@ -40,10 +40,12 @@
 	    delsubstvar($package, "haskell:Depends");
 	    addsubstvar($package, "haskell:Depends", 
 			$pkgtype, ">= " . upstream_version(version_of_type($pkgtype)));
-	    if (! ($pkgtype eq "hugs")) {
-		addsubstvar($package, "haskell:Depends",
-			    $pkgtype, "<< " . upstream_version(version_of_type($pkgtype)) . "-999");
-	    }
+# It is probably true that doc packages won't work after a newer haddock package is installed,
+# but this dependency makes bootstrapping that new version of haddock a nightmare.
+#	    if (! ($pkgtype eq "hugs")) {
+#		addsubstvar($package, "haskell:Depends",
+#			    $pkgtype, "<< " . upstream_version(version_of_type($pkgtype)) . "-999");
+#	    }
 
 	    # add postinst/prerm scripts
 	    if ($pkgtype eq "ghc6") {
@@ -55,9 +55,23 @@
 
 		print "$ghcver $pkglibdir $cabalname $cabalversion\n";
 		autoscript($package,"postinst","postinst-ghc",
-			   "s%#GHCVER#%$ghcver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%");
+			   "s%#GHCVER#%$ghcver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%;s%#PACKAGE#%$package%");
 		autoscript($package,"prerm","prerm-ghc",
-			   "s%#GHCVER#%$ghcver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%");
+			   "s%#GHCVER#%$ghcver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%;s%#PACKAGE#%$package%");
+	    }
+	    elsif ($pkgtype eq "haddock") {
+		my $haddockver = "haddock-" . upstream_version(version_of_type($pkgtype));
+		my $pkglibdir = getcabalpkglibpath($pkgtype);
+		my $cabalname = getcabalname();
+		my $cabalversion = getcabalversion();
+
+		print "$haddockver $pkglibdir $cabalname $cabalversion\n";
+		autoscript($package,"postrm","postrm-ghc-doc",
+			   "s%#HADDOCKVER#%$haddockver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%;s%#PACKAGE#%$package%");
+		autoscript($package,"postinst","postinst-ghc-doc",
+			   "s%#HADDOCKVER#%$haddockver%;s%#PKGLIBDIR#%$pkglibdir%;s%#CABALNAME#%$cabalname%;s%#CABALVERSION#%$cabalversion%;s%#PACKAGE#%$package%");
+		addsubstvar($package, "haskell:Depends",
+			    "ghc6-doc", "")
 	    }
 	}