[Pkg-haskell-commits] r1028 - in /packages/haskell-devscripts/trunk: debian/changelog dh_haskell_build

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Jan 27 21:25:34 2008
New Revision: 1028

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=1028
Log:
 r2559 at nebula:  arjan | 2008-01-27 17:34:48 +0100
 * dh_haskell_build:
   - The new Cabal version 1.2 generates the .setup-config as
     dist/setup-config so try this location as well.

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

Modified: packages/haskell-devscripts/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/debian/changelog?rev=1028&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/changelog (original)
+++ packages/haskell-devscripts/trunk/debian/changelog Sun Jan 27 21:25:34 2008
@@ -1,3 +1,11 @@
+haskell-devscripts (0.6.7~pre1) unstable; urgency=low
+
+  * dh_haskell_build:
+    - The new Cabal version 1.2 generates the .setup-config as
+      dist/setup-config so try this location as well.
+
+ -- Arjan Oosting <arjan at debian.org>  Sun, 27 Jan 2008 15:28:57 +0100
+
 haskell-devscripts (0.6.6) unstable; urgency=low
 
   * dh_haskell_install:

Modified: packages/haskell-devscripts/trunk/dh_haskell_build
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_build?rev=1028&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_build (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_build Sun Jan 27 21:25:34 2008
@@ -166,7 +166,8 @@
 	print " BUILDING $package FOR $pkgtype";
 	print "\n ****************************************** \n\n";
 
-	if (! -e "$builddir/.setup-config" ) {
+	if (! -e "$builddir/.setup-config" &&
+	    ! -e "$builddir/dist/setup-config" ) {
 	    print "Running missing dh_haskell_configure call...\n";
 	    doit ("dh_haskell_configure", @savedargv);
 	    print "\n ****************************************** \n";