[Pkg-haskell-commits] darcs: haskell-leksah-server: Refresh leksah-process bundling patch

[Joachim Breitner]

Fri May 27 15:31:11 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh leksah-process bundling patch
  Ignore-this: bf10e0ce4e0f1f1a9fe3c3a32d7a7961

    M ./patches/use_bundled_leksah-process.patch -26 +29

Fri May 27 15:31:11 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh leksah-process bundling patch
  Ignore-this: bf10e0ce4e0f1f1a9fe3c3a32d7a7961
diff -rN -u old-haskell-leksah-server//patches/use_bundled_leksah-process.patch new-haskell-leksah-server//patches/use_bundled_leksah-process.patch
--- old-haskell-leksah-server//patches/use_bundled_leksah-process.patch	2011-05-27 18:50:26.705304565 +0000
+++ new-haskell-leksah-server//patches/use_bundled_leksah-process.patch	2011-05-27 18:50:26.745299450 +0000
@@ -1,24 +1,25 @@
-Index: haskell-leksah-server-0.8.0.6/leksah-server.cabal
+Index: haskell-leksah-server-0.10.0.4/leksah-server.cabal
 ===================================================================
---- haskell-leksah-server-0.8.0.6.orig/leksah-server.cabal	2010-06-12 12:58:26.000000000 +0200
-+++ haskell-leksah-server-0.8.0.6/leksah-server.cabal	2010-06-12 13:08:21.000000000 +0200
-@@ -31,7 +31,7 @@
-                binary-shared >=0.8, bytestring >=0.9.0.1, containers >=0.2.0.0,
-                directory >=1.0.0.2, filepath >=1.1.0.1, ghc >=6.10.1,
-                ltk >=0.8 && <= 0.9, mtl >=1.1.0.2, parsec >=2.1.0.1,
--               pretty >=1.0.1.0, process-leksah >=1.0.1.3, time >= 1.1, deepseq >= 1.1,
-+               pretty >=1.0.1.0, time >= 1.1, deepseq >= 1.1,
-                hslogger >= 1.0.7, network >= 2.2 && <= 3.0
+--- haskell-leksah-server-0.10.0.4.orig/leksah-server.cabal	2011-04-21 10:46:32.000000000 +0200
++++ haskell-leksah-server-0.10.0.4/leksah-server.cabal	2011-05-27 17:30:41.000000000 +0200
+@@ -36,7 +36,7 @@
+                containers >=0.2.0.0 && <0.5,
+                directory >=1.0.0.2 && <1.2, filepath >=1.1.0.1 && <1.3, ghc >=6.10.1 && <7.1,
+                ltk >=0.9 && <1.0, mtl >=1.1.0.2 && <2.1, parsec >=2.1.0.1 && <3.2,
+-               pretty >=1.0.1.0 && <1.1, process-leksah >=1.0.1.3 && <1.1, time >=1.1 && <1.3, deepseq >=1.1 && <1.2,
++               pretty >=1.0.1.0 && <1.1, time >=1.1 && <1.3, deepseq >=1.1 && <1.2,
+                hslogger >= 1.0.7 && <1.2, network >=2.2 && <3.0
      if (impl(ghc >= 6.12))
-        build-depends: haddock >= 2.7.2
-@@ -67,12 +67,24 @@
+        build-depends: haddock >= 2.7.2 && <2.10
+@@ -72,13 +72,27 @@
         ghc-options: -Wall -ferror-spans -O2
      ghc-prof-options: -auto-all -prof
  
-+    -- Bundled leksah-process
 +    exposed-modules:
 +        IDE.System.Process
-+        IDE.System.Process.Internals
++    if impl(ghc)
++        exposed-modules:
++          IDE.System.Process.Internals
 +    c-sources:
 +        process-leksah/cbits/runProcess.c
 +    include-dirs: process-leksah/include
@@ -27,18 +28,20 @@
 +    cpp-options: -Dbase4
 +    hs-source-dirs: process-leksah
 +
++
  executable leksah-server
-     build-depends: Cabal >=1.6.0.1, base >= 4.0.0.0 && <= 5, binary >=0.5.0.0,
-                binary-shared >=0.8, bytestring >=0.9.0.1, containers >=0.2.0.0,
-                directory >=1.0.0.2, filepath >=1.1.0.1, ghc >=6.10.1,
-                ltk >=0.8 && <= 0.9, mtl >=1.1.0.2, parsec >=2.1.0.1,
--               pretty >=1.0.1.0, process-leksah >=1.0.1.3, deepseq >= 1.1, network >= 2.2 && <= 3.0
-+               pretty >=1.0.1.0, deepseq >= 1.1, network >= 2.2 && <= 3.0
+     build-depends: Cabal >=1.6.0.1 && <1.11, base >= 4.0.0.0 && <4.4, binary >=0.5.0.0 && <0.6,
+                binary-shared >=0.8 && <0.9, bytestring >=0.9.0.1 && <0.10,
+                containers >=0.2.0.0 && <0.5,
+                directory >=1.0.0.2 && <1.2, filepath >=1.1.0.1 && <1.3, ghc >=6.10.1 && <7.1,
+                ltk >=0.9 && <1.0, mtl >=1.1.0.2 && <2.1, parsec >=2.1.0.1 && <3.2,
+-               pretty >=1.0.1.0 && <1.1, process-leksah >=1.0.1.3 && <1.1, time >=1.1 && <1.3, deepseq >=1.1 && <1.2,
++               pretty >=1.0.1.0 && <1.1, time >=1.1 && <1.3, deepseq >=1.1 && <1.2,
+                hslogger >= 1.0.7 && <1.2, network >=2.2 && <3.0
      if (impl(ghc >= 6.12))
-        build-depends: haddock >= 2.7.2
-     else
-@@ -106,6 +118,13 @@
-        ghc-options: -Wall -ferror-spans -threaded -O2
+        build-depends: haddock >= 2.7.2 && <2.10
+@@ -120,6 +134,13 @@
+         ghc-options: -Wall -ferror-spans -O2
      ghc-prof-options: -auto-all -prof
  
 +    -- Bundled leksah-process
@@ -51,9 +54,9 @@
  executable leksahecho
      main-is: LeksahEcho.hs
      buildable: True
-@@ -118,4 +137,9 @@
+@@ -139,4 +160,9 @@
      else
-        ghc-options: -Wall -ferror-spans -threaded -O2
+        ghc-options: -Wall -ferror-spans -O2
  
 -
 +    -- Bundled leksah-process