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

[arjan at users.alioth.debian.org]

Author: arjan
Date: Thu Jan 10 23:35:14 2008
New Revision: 923

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=923
Log:
 r2372 at nebula:  arjan | 2008-01-11 00:22:57 +0100
 * dh_haskell_install:
   - The new Cabal version 1.2 generates the .installed-pkg-config as
     dist/installed-pkg-config so try this location as well. 
     (Closes: #460138) 

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=923&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/changelog (original)
+++ packages/haskell-devscripts/trunk/debian/changelog Thu Jan 10 23:35:14 2008
@@ -1,3 +1,12 @@
+haskell-devscripts (0.6.3~pre1) unstable; urgency=low
+
+  * dh_haskell_install:
+    - The new Cabal version 1.2 generates the .installed-pkg-config as
+      dist/installed-pkg-config so try this location as well. 
+      (Closes: #460138) 
+
+ -- Arjan Oosting <arjan at debian.org>  Fri, 11 Jan 2008 00:22:19 +0100
+
 haskell-devscripts (0.6.2) unstable; urgency=low
 
   * dh_haskell_install: Prepend the package build directory before the

Modified: packages/haskell-devscripts/trunk/dh_haskell_install
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_install?rev=923&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_install (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_install Thu Jan 10 23:35:14 2008
@@ -81,8 +81,13 @@
 # Remove empty directories from package
 	    finddepth({wanted => \&remove_emptydir}, "$tmp/usr/lib");
 
-	    open INCONFIG , "<", ".installed-pkg-config" or
-		die "Cannot read .installed-pkg-config: $!";
+	    if ( -e "dist/installed-pkg-config" ) {
+		my $inconfig = "dist/installed-pkg-config" ;
+	    } else {
+		my $inconfig = ".installed-pkg-config" ;
+	    }
+	    open INCONFIG , "<", $inconfig or
+		die "Cannot read $inconfig: $!";
 	    open OUTCONFIG, ">", "$tmp" .
 		getcabalpkglibpath($pkgtype) . "/installed-pkg-config"
 		or die "Cannot write installed-pkg-config: $!";