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

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Jan 13 23:03:02 2008
New Revision: 968

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=968
Log:
 r2458 at nebula:  arjan | 2008-01-13 23:28:54 +0100
 * dh_haskell_install:
   - Write the correct path to the generated documentation in the package
     description file.
 

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=968&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/changelog (original)
+++ packages/haskell-devscripts/trunk/debian/changelog Sun Jan 13 23:03:02 2008
@@ -1,3 +1,11 @@
+haskell-devscripts (0.6.6~pre1) unstable; urgency=low
+
+  * dh_haskell_install:
+    - Write the correct path to the generated documentation in the package
+      description file.
+  
+ -- Arjan Oosting <arjan at debian.org>  Sun, 13 Jan 2008 23:27:56 +0100
+
 haskell-devscripts (0.6.5) unstable; urgency=low
   
   * debian/control:

Modified: packages/haskell-devscripts/trunk/dh_haskell_install
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_install?rev=968&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_install (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_install Sun Jan 13 23:03:02 2008
@@ -117,8 +117,8 @@
 		}
 		if (defined($haddockpkg)) {
 		    if(cabal_version_ge(1.2)) {
-			s%(haddock-interfaces:).*/doc/$cabalnameversion/html/(.*\.haddock)%$1 /usr/share/doc/$haddockpkg/$cabalname/$2%;
-			s%(haddock-html:).*/doc/$cabalnameversion/html%$1 /usr/share/doc/$haddockpkg/$cabalname%;
+			s%(haddock-interfaces:).*/doc/$cabalnameversion/html/(.*\.haddock)%$1 /usr/share/doc/$haddockpkg/html/$cabalname/$2%;
+			s%(haddock-html:).*/doc/$cabalnameversion/html%$1 /usr/share/doc/$haddockpkg/html/$cabalname%;
 		    } else {
 			s%(haddock-interfaces:).*/doc(/html/.*\.haddock)%$1 /usr/share/doc/$haddockpkg$2%;
 			s%(haddock-html:).*/doc(/html)%$1 /usr/share/doc/$haddockpkg$2%;