[Pkg-haskell-commits] r893 - in /packages/haskell-devscripts/trunk: debian/changelog dh_haskell_install

[arjan at users.alioth.debian.org]

Author: arjan
Date: Thu Jan  3 22:54:54 2008
New Revision: 893

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=893
Log:
 r2316 at nebula:  arjan | 2008-01-03 23:51:44 +0100
 * dh_haskell_install: Prepend the package build directory before the
   installation directory of generated API documentation. This will fix
   several FTBFS bugs in other packages. (Closes: #458872, #458875)

Modified:
    packages/haskell-devscripts/trunk/debian/changelog
    packages/haskell-devscripts/trunk/dh_haskell_install

Modified: packages/haskell-devscripts/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/debian/changelog?rev=893&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/changelog (original)
+++ packages/haskell-devscripts/trunk/debian/changelog Thu Jan  3 22:54:54 2008
@@ -1,3 +1,11 @@
+haskell-devscripts (0.6.2~1) unstable; urgency=low
+
+  * dh_haskell_install: Prepend the package build directory before the
+    installation directory of generated API documentation. This will fix
+    several FTBFS bugs in other packages. (Closes: #458872, #458875)
+
+ -- Arjan Oosting <arjan at debian.org>  Thu, 03 Jan 2008 23:11:49 +0100
+
 haskell-devscripts (0.6.1) unstable; urgency=low
 
   * dh_haskell_*: 

Modified: packages/haskell-devscripts/trunk/dh_haskell_install
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_install?rev=893&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_install (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_install Thu Jan  3 22:54:54 2008
@@ -117,7 +117,7 @@
 	    finddepth({wanted => \&remove_emptydir}, "$tmp/usr/lib");
 	} elsif ($pkgtype eq "haddock" ) {
 	    mkpath("$tmp" . "/usr/share/doc/$package");
-	    doit("cp", "-ar", "dist/doc/*", "$tmp", "/usr/share/doc/$package");
+	    doit("cp", "-ar", "dist/doc/html", "$tmp/usr/share/doc/$package");
 	}
 
 	chdir($olddir);