[Pkg-haskell-commits] darcs: darcs: Use System.Process.system instead of System.system as the latter is no longer able to be imported together with `base'. Fixes FTBFS.

[Iain Lane]

Thu Mar  1 11:33:02 UTC 2012  Iain Lane <laney at debian.org>
  * Use System.Process.system instead of System.system as the latter is no longer able to be imported together with `base'. Fixes FTBFS.
  Ignore-this: 87467a373555f0ef5710fcf97640bf56

    M! ./changelog -8 +2
    A! ./patches/import-system-from-System.Process
    M! ./patches/series -1

Thu Mar  1 11:33:02 UTC 2012  Iain Lane <laney at debian.org>
  * Use System.Process.system instead of System.system as the latter is no longer able to be imported together with `base'. Fixes FTBFS.
  Ignore-this: 87467a373555f0ef5710fcf97640bf56
diff -rN -u old-darcs//changelog new-darcs//changelog
--- old-darcs//changelog	2012-04-28 00:06:12.289756463 +0000
+++ new-darcs//changelog	2012-04-28 00:06:12.757754099 +0000
@@ -1,9 +1,3 @@
-darcs (2.5.2-7) UNRELEASED; urgency=low
-
-  * Adjust dependencies for GHC 7.4.1
-
- -- Joachim Breitner <nomeata at debian.org>  Sat, 10 Mar 2012 16:33:31 +0100
-
 darcs (2.5.2-6) unstable; urgency=low
 
   * Use hlibrary.setup instead of runhaskell
diff -rN -u old-darcs//patches/import-system-from-System.Process new-darcs//patches/import-system-from-System.Process
--- old-darcs//patches/import-system-from-System.Process	1970-01-01 00:00:00.000000000 +0000
+++ new-darcs//patches/import-system-from-System.Process	2012-04-28 00:06:12.597753860 +0000
@@ -0,0 +1,19 @@
+Description: Can no longer import System as of GHC 7.4; use system function
+  from System.Process instead
+Author: Iain Lane <laney at debian.org>
+Forwarded: not-needed
+
+--- darcs-2.5.2.orig/Distribution/ShellHarness.hs
++++ darcs-2.5.2/Distribution/ShellHarness.hs
+@@ -12,10 +12,9 @@ import System.Environment ( getEnv, getE
+ import System.Exit ( ExitCode (..) )
+ import System.FilePath
+ import System.IO
+-import System( system )
+ import System.Process ( ProcessHandle,
+                         runInteractiveProcess, waitForProcess,
+-                        getProcessExitCode )
++                        getProcessExitCode, system )
+ import Data.Maybe
+ import Data.List ( isInfixOf, isPrefixOf, (\\), nubBy, isSuffixOf )
+ import Control.Concurrent
diff -rN -u old-darcs//patches/series new-darcs//patches/series
--- old-darcs//patches/series	2012-04-28 00:06:12.261752392 +0000
+++ new-darcs//patches/series	2012-04-28 00:06:12.577750483 +0000
@@ -4,4 +4,3 @@
 relax-regex-compat-version
 tests-use-bash
 disable-test1763
-system-process-system