[Pkg-haskell-commits] darcs: haskell-leksah-server: threaded_flag.cabal: Removed, applied upstream

[Joachim Breitner]

Fri May 27 17:54:55 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * threaded_flag.cabal: Removed, applied upstream
  Ignore-this: ab194b98e60c375f2a36bd39fbe9f47

    M ./changelog +1
    M ./patches/series -1
    R ./patches/threaded_flag.cabal

Fri May 27 17:54:55 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * threaded_flag.cabal: Removed, applied upstream
  Ignore-this: ab194b98e60c375f2a36bd39fbe9f47
diff -rN -u old-haskell-leksah-server//changelog new-haskell-leksah-server//changelog
--- old-haskell-leksah-server//changelog	2011-05-27 18:50:27.328312892 +0000
+++ new-haskell-leksah-server//changelog	2011-05-27 18:50:27.340602385 +0000
@@ -5,6 +5,7 @@
 
   [ Joachim Breitner ]
   * New upstream release
+  * threaded_flag.cabal: Removed, applied upstream
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 27 May 2011 17:26:13 +0200
 
diff -rN -u old-haskell-leksah-server//patches/series new-haskell-leksah-server//patches/series
--- old-haskell-leksah-server//patches/series	2011-05-27 18:50:27.328312892 +0000
+++ new-haskell-leksah-server//patches/series	2011-05-27 18:50:27.336788546 +0000
@@ -1,2 +1 @@
 use_bundled_leksah-process.patch
-threaded_flag.cabal
diff -rN -u old-haskell-leksah-server//patches/threaded_flag.cabal new-haskell-leksah-server//patches/threaded_flag.cabal
--- old-haskell-leksah-server//patches/threaded_flag.cabal	2011-05-27 18:50:27.328312892 +0000
+++ new-haskell-leksah-server//patches/threaded_flag.cabal	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-Index: haskell-leksah-server-0.8.0.6/leksah-server.cabal
-===================================================================
---- haskell-leksah-server-0.8.0.6.orig/leksah-server.cabal	2010-08-23 08:00:19.000000000 -0300
-+++ haskell-leksah-server-0.8.0.6/leksah-server.cabal	2010-08-23 10:39:32.000000000 -0300
-@@ -26,6 +26,10 @@
-     Default: False
-     Description: Use libcurl instead of running wget
- 
-+flag threaded
-+    default: True
-+    description: Build with support for multithreaded execution
-+
- library
-     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,
-@@ -112,10 +116,14 @@
-         IDE.Metainfo.WorkspaceCollector IDE.Metainfo.InterfaceCollector
-         IDE.Metainfo.SourceCollectorH IDE.Metainfo.SourceDB IDE.Utils.Tool
-         IDE.HeaderParser IDE.Metainfo.PackageCollector
--    if (impl(ghc >= 6.12))
--       ghc-options: -Wall -fno-warn-unused-do-bind -ferror-spans -threaded -O2
-+
-+    if flag(threaded)
-+        ghc-options: -threaded
-+
-+    if impl(ghc >= 6.12)
-+        ghc-options: -Wall -fno-warn-unused-do-bind -ferror-spans -O2
-     else
--       ghc-options: -Wall -ferror-spans -threaded -O2
-+        ghc-options: -Wall -ferror-spans -O2
-     ghc-prof-options: -auto-all -prof
- 
-     -- Bundled leksah-process
-@@ -132,10 +140,13 @@
-     hs-source-dirs: src
-     ghc-prof-options: -auto-all -prof
-     ghc-shared-options: -auto-all -prof
-+    if flag(threaded)
-+        ghc-options: -threaded
-+
-     if (impl(ghc >= 6.12))
--       ghc-options: -Wall -fno-warn-unused-do-bind -ferror-spans -threaded -O2
-+       ghc-options: -Wall -fno-warn-unused-do-bind -ferror-spans -O2
-     else
--       ghc-options: -Wall -ferror-spans -threaded -O2
-+       ghc-options: -Wall -ferror-spans -O2
- 
-     -- Bundled leksah-process
-     c-sources: