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

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Dec 30 18:08:17 2007
New Revision: 812

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=812
Log:
[project @ Fixed split with dh_haskell_build]

Original author: John Goerzen <jgoerzen at complete.org>
Date: 2005-08-17 19:41:27+00:00

Modified:
    packages/haskell-devscripts/trunk/debian/changelog
    packages/haskell-devscripts/trunk/dh_haskell_build
    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=812&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/debian/changelog (original)
+++ packages/haskell-devscripts/trunk/debian/changelog Sun Dec 30 18:08:17 2007
@@ -1,3 +1,9 @@
+haskell-devscripts (0.5.8) unstable; urgency=low
+
+  * Fixed split between dh_haskell_build.
+
+ -- John Goerzen <jgoerzen at complete.org>  Wed, 17 Aug 2005 03:41:05 -0500
+
 haskell-devscripts (0.5.7) unstable; urgency=low
 
   * Added dh_haskell_{prep,build,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=812&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_build (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_build Sun Dec 30 18:08:17 2007
@@ -186,9 +186,13 @@
         
         if ($pkgtype eq "hugs") {
             safesystem("./setup configure --hugs");
+            # Cabal always dies here.
+            print "Running: ./setup build\n";
+            system("./setup build");
         } else {
             safesystem("./setup configure --prefix=" . getcabalbasepath($pkgtype)
                        . " --with-compiler=/usr/bin/$pkgtype");
+            safesystem("./setup build");
         }
     }
 }

Modified: packages/haskell-devscripts/trunk/dh_haskell_install
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-devscripts/trunk/dh_haskell_install?rev=812&op=diff
==============================================================================
--- packages/haskell-devscripts/trunk/dh_haskell_install (original)
+++ packages/haskell-devscripts/trunk/dh_haskell_install Sun Dec 30 18:08:17 2007
@@ -175,13 +175,9 @@
     my $tmp = tmpdir($package);
     if (is_handled_package($package)) {
         if ($pkgtype eq "hugs") {
-            # Cabal always dies here.
-            print "Running: ./setup build\n";
-            system("./setup build");
             safesystem("mkdir -p $tmp/usr/lib/hugs/libraries");
             safesystem("cp -rv dist/build/* $tmp/usr/lib/hugs/libraries/");
         } else {
-            safesystem("./setup build");
             safesystem("mkdir -p $tmp/usr/share/doc/$package");
             safesystem("mkdir -p $tmp" . getcabalbasepath($pkgtype));
             safesystem("./setup copy --copy-prefix=$tmp" . getcabalbasepath($pkgtype));