[Pkg-haskell-commits] [package-plan] 01/01: Added patches
Joachim Breitner
nomeata at moszumanska.debian.org
Sat Aug 2 08:57:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch leksah-0.13
in repository package-plan.
commit ef4fe496ccb42d9e198346a9af1c623d31a791c7
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Sat Aug 2 10:57:00 2014 +0200
Added patches
---
patches/leksah-server/0.13.1.1/conduit-1.1-compat | 81 ++++++++++++++++
patches/leksah-server/0.13.1.1/series | 1 +
patches/leksah/0.13.4.3/bump-deps | 110 ++++++++++++++++++++++
patches/leksah/0.13.4.3/series | 1 +
4 files changed, 193 insertions(+)
diff --git a/patches/leksah-server/0.13.1.1/conduit-1.1-compat b/patches/leksah-server/0.13.1.1/conduit-1.1-compat
new file mode 100644
index 0000000..335beea
--- /dev/null
+++ b/patches/leksah-server/0.13.1.1/conduit-1.1-compat
@@ -0,0 +1,81 @@
+From f9fadb7c73048bdfd48417b1374e9e2f1c80b3e8 Mon Sep 17 00:00:00 2001
+From: Mark Wright <gienah at gentoo.org>
+Date: Fri, 27 Jun 2014 00:08:25 +1000
+Subject: [PATCH] Fix Issue 290: conduit-1.1 compatibility
+
+---
+ leksah-server.cabal | 21 ++++++++++-----------
+ src/IDE/Utils/Tool.hs | 2 +-
+ 2 files changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/leksah-server.cabal b/leksah-server.cabal
+index 04cbce6..55da5ff 100644
+--- a/leksah-server.cabal
++++ b/leksah-server.cabal
+@@ -38,9 +38,9 @@ library
+ directory >=1.0.0.2 && <1.3, filepath >=1.1.0.1 && <1.4, ghc >=7.0.4 && <7.9,
+ ltk >=0.13.1.0 && <0.14, parsec >=2.1.0.1 && <3.2,
+ pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
+- hslogger >= 1.0.7 && <1.3, network >=2.2 && <3.0, conduit >= 1.0.8 && <1.1,
+- attoparsec-conduit >=1.0.1.2 && <1.1, attoparsec >=0.10.0.3 && <0.12,
+- transformers >=0.2.2.0 && <0.4, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.2
++ hslogger >= 1.0.7 && <1.3, network >=2.2 && <3.0, conduit >= 1.0.8 && <1.2, conduit-extra,
++ attoparsec-conduit >=1.1, attoparsec >=0.10.0.3 && <0.12,
++ transformers >=0.2.2.0 && <0.5, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.2
+ if (impl(ghc >= 7.8))
+ build-depends: haddock >= 2.7.2 && <2.15
+ else
+@@ -101,9 +101,9 @@ executable leksah-server
+ directory >=1.0.0.2 && <1.3, filepath >=1.1.0.1 && <1.6, ghc >=7.0.4 && <7.9,
+ ltk >=0.13.1.0 && <0.14, parsec >=2.1.0.1 && <3.2,
+ pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
+- hslogger >= 1.0.7 && <1.3, network >=2.2 && <3.0, conduit >= 1.0.8 && <1.1,
+- attoparsec-conduit >=1.0.1.2 && <1.1, attoparsec >=0.10.0.3 && <0.12,
+- transformers >=0.2.2.0 && <0.4, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.2
++ hslogger >= 1.0.7 && <1.3, network >=2.2 && <3.0, conduit >= 1.0.8 && <1.2, conduit-extra,
++ attoparsec-conduit >=1.1, attoparsec >=0.10.0.3 && <0.12,
++ transformers >=0.2.2.0 && <0.5, strict >=0.3.2 && <0.4, text >=0.11.3.1 && <1.2
+ if (impl(ghc >= 7.8))
+ build-depends: haddock >= 2.7.2 && <2.15
+ else
+@@ -173,9 +173,9 @@ executable leksahecho
+ ghc-prof-options: -auto-all -prof
+ -- ghc-shared-options: -auto-all -prof
+ build-depends: base >= 4.0.0.0 && <4.8, hslogger >= 1.0.7 && <1.3, deepseq >=1.1 && <1.4,
+- bytestring >=0.9.0.1 && <0.11, conduit >= 1.0.8 && <1.1,
+- attoparsec-conduit >=1.0.1.2 && <1.1, attoparsec >=0.10.0.3 && <0.12,
+- transformers >=0.2.2.0 && <0.4, text >=0.11.3.1 && <1.2
++ bytestring >=0.9.0.1 && <0.11, conduit >= 1.0.8 && <1.2, conduit-extra,
++ attoparsec-conduit >=1.1, attoparsec >=0.10.0.3 && <0.12,
++ transformers >=0.2.2.0 && <0.5, text >=0.11.3.1 && <1.2
+
+ if (impl(ghc >= 7.2))
+ build-depends: process >= 1.1 && <1.3
+@@ -197,10 +197,9 @@ test-suite test-tool
+ main-is: TestTool.hs
+ build-depends: base >= 4.0.0.0 && <4.8, hslogger >= 1.0.7 && <1.3,
+ leksah-server == 0.13.1.1,
+- HUnit >=1.2 && <1.3, transformers >=0.2.2.0 && <0.4, conduit >= 1.0.8 && <1.1
++ HUnit >=1.2 && <1.3, transformers >=0.2.2.0 && <0.5, conduit >= 1.0.8 && <1.2, conduit-extra
+
+ if (impl(ghc >= 7.2))
+ build-depends: process >= 1.1 && <1.3
+ else
+ build-depends: process-leksah >=1.0.1.3 && <1.1
+-
+diff --git a/src/IDE/Utils/Tool.hs b/src/IDE/Utils/Tool.hs
+index c04d54a..48eab1b 100644
+--- a/src/IDE/Utils/Tool.hs
++++ b/src/IDE/Utils/Tool.hs
+@@ -148,7 +148,7 @@ runTool' :: FilePath -> [String] -> Maybe FilePath -> IO ([ToolOutput], ProcessH
+ runTool' fp args mbDir = do
+ debugM "leksah-server" $ "Start: " ++ show (fp, args)
+ (out,pid) <- runTool fp args mbDir
+- output <- C.runResourceT $ out $$ CL.consume
++ output <- out $$ CL.consume
+ waitForProcess pid
+ debugM "leksah-server" $ "End: " ++ show (fp, args)
+ return (output,pid)
+--
+2.0.3
+
diff --git a/patches/leksah-server/0.13.1.1/series b/patches/leksah-server/0.13.1.1/series
new file mode 100644
index 0000000..f5176af
--- /dev/null
+++ b/patches/leksah-server/0.13.1.1/series
@@ -0,0 +1 @@
+conduit-1.1-compat
diff --git a/patches/leksah/0.13.4.3/bump-deps b/patches/leksah/0.13.4.3/bump-deps
new file mode 100644
index 0000000..37a5dce
--- /dev/null
+++ b/patches/leksah/0.13.4.3/bump-deps
@@ -0,0 +1,110 @@
+From fde1de5770b0acdb359a1b17d1de33473159912b Mon Sep 17 00:00:00 2001
+From: Mark Wright <gienah at gentoo.org>
+Date: Fri, 27 Jun 2014 00:26:40 +1000
+Subject: [PATCH] Bump deps: conduit to 1.1, QuickCheck to 2.7, mtl to 2.2,
+ transformers to 0.4, haskell-src-exts to 0.15. yi dep test version should be
+ consistent.
+
+---
+ leksah.cabal | 12 ++++++------
+ src/IDE/Debug.hs | 2 +-
+ src/IDE/Package.hs | 2 +-
+ src/IDE/Pane/PackageEditor.hs | 2 +-
+ src/IDE/Sandbox.hs | 2 +-
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+Index: leksah-0.13.4.3/leksah.cabal
+===================================================================
+--- leksah-0.13.4.3.orig/leksah.cabal 2014-08-02 10:21:06.206252478 +0200
++++ leksah-0.13.4.3/leksah.cabal 2014-08-02 10:21:06.206252478 +0200
+@@ -247,16 +247,16 @@
+ build-depends: Cabal >=1.10.2.0 && <1.22, base >=4.0.0.0 && <4.8, binary >=0.5.0.0 && <0.8,
+ bytestring >=0.9.0.1 && <0.11, containers >=0.2.0.0 && <0.6, directory >=1.0.0.2 && <3.1,
+ filepath >=1.1.0.1 && <1.4, glib >=0.10 && <0.13,
+- mtl >=1.1.0.2 && <2.2, old-time >=1.0.0.1 && <1.2,
++ mtl >=1.1.0.2 && <2.3, old-time >=1.0.0.1 && <1.2,
+ parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
+ regex-tdfa >=1.1 && <1.3, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.6,
+ time >=0.1 && <1.5, ltk >= 0.13.2.0 && <0.14, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,
+ hslogger >= 1.0.7 && <1.3, leksah-server >=0.13.1.0 && <0.14, network >= 2.2 && <3.0,
+- ghc >=6.10.1 && <7.9, strict >= 0.3.2 && <0.4, conduit >= 1.0.8 && <1.1, text >= 0.11.1.5 && < 1.2,
+- gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
++ ghc >=6.10.1 && <7.9, strict >= 0.3.2 && <0.4, conduit >= 1.1 && <1.2, conduit-extra, text >= 0.11.1.5 && < 1.2,
++ gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.5,
+ executable-path >=0.0.3 && <0.1,
+ vcsgui >=0.0.4 && < 0.1, vcswrapper >=0.0.4 && < 0.1,
+- QuickCheck >=2.4.2 && <2.7, haskell-src-exts >=1.13.5 && <1.15,
++ QuickCheck >=2.4.2 && <2.8, haskell-src-exts >=1.13.5 && <1.16,
+ hlint >=1.8.59 && <1.9, vado >=0.0.1 && <0.1, shakespeare >=2.0.0.1 && <2.1
+ exposed-modules: IDE.Leksah IDE.Completion IDE.ImportTool IDE.Find
+ IDE.Sandbox IDE.Session IDE.Command IDE.Keymap IDE.Utils.GUIUtils
+@@ -339,7 +339,7 @@
+
+ test-suite tests
+ build-depends: base >=4.0.0.0 && <4.8, Cabal >=1.10.2.0 && <1.22,
+- QuickCheck >=2.4.2 && <2.7, leksah ==0.13.4.3,
++ QuickCheck >=2.4.2 && <2.8, leksah ==0.13.4.3,
+ containers, ltk, leksah-server, hslogger,
+ transformers, glib, monad-loops
+ if flag(gtk3)
+@@ -348,7 +348,7 @@
+ else
+ build-depends: gtk >=0.12.4 && <0.13, gtksourceview2 >=0.10.0 && <0.13, webkit -any
+ if flag(yi)
+- build-depends: yi >=0.6.6.1 && <0.7
++ build-depends: yi >=0.8.1 && <0.9
+ type: exitcode-stdio-1.0
+ main-is: Tests.hs
+ other-modules: IDE.TextEditor.Tests
+Index: leksah-0.13.4.3/src/IDE/Debug.hs
+===================================================================
+--- leksah-0.13.4.3.orig/src/IDE/Debug.hs 2014-08-02 10:21:06.206252478 +0200
++++ leksah-0.13.4.3/src/IDE/Debug.hs 2014-08-02 10:21:06.206252478 +0200
+@@ -82,7 +82,7 @@
+ import IDE.Workspaces (packageTry)
+ import qualified Data.Conduit as C
+ import qualified Data.Conduit.List as CL
+-import qualified Data.Conduit.Util as CU
++import qualified Data.Conduit.Internal as CU
+ import Control.Monad.Trans.Class (MonadTrans(..))
+ import Control.Monad.Trans.Reader (ask)
+ import Control.Monad.IO.Class (MonadIO(..))
+Index: leksah-0.13.4.3/src/IDE/Package.hs
+===================================================================
+--- leksah-0.13.4.3.orig/src/IDE/Package.hs 2014-08-02 10:21:06.206252478 +0200
++++ leksah-0.13.4.3/src/IDE/Package.hs 2014-08-02 10:21:06.206252478 +0200
+@@ -105,7 +105,7 @@
+ ProcessHandle)
+ import qualified Data.Conduit as C (Sink)
+ import qualified Data.Conduit.List as CL (foldM, fold, consume)
+-import qualified Data.Conduit.Util as CU (zipSinks)
++import qualified Data.Conduit.Internal as CU (zipSinks)
+ import Data.Conduit (($$))
+ import Control.Monad.Trans.Reader (ask)
+ import Control.Monad.IO.Class (MonadIO(..))
+Index: leksah-0.13.4.3/src/IDE/Pane/PackageEditor.hs
+===================================================================
+--- leksah-0.13.4.3.orig/src/IDE/Pane/PackageEditor.hs 2014-08-02 10:21:06.206252478 +0200
++++ leksah-0.13.4.3/src/IDE/Pane/PackageEditor.hs 2014-08-02 10:21:06.206252478 +0200
+@@ -102,7 +102,7 @@
+
+ import Text.Printf (printf)
+ import Control.Applicative ((<*>), (<$>))
+-import qualified Data.Conduit.Util as CU (zipSinks)
++import qualified Data.Conduit.Internal as CU (zipSinks)
+ import IDE.Utils.Tool (ToolOutput(..))
+ import System.Exit (ExitCode(..))
+ import qualified Data.Conduit.List as CL (fold)
+Index: leksah-0.13.4.3/src/IDE/Sandbox.hs
+===================================================================
+--- leksah-0.13.4.3.orig/src/IDE/Sandbox.hs 2014-08-02 10:21:06.206252478 +0200
++++ leksah-0.13.4.3/src/IDE/Sandbox.hs 2014-08-02 10:21:06.206252478 +0200
+@@ -28,7 +28,7 @@
+ import System.FilePath (dropFileName)
+ import qualified Data.Conduit as C (Sink)
+ import qualified Data.Conduit.List as CL (fold)
+-import qualified Data.Conduit.Util as CU (zipSinks)
++import qualified Data.Conduit.Internal as CU (zipSinks)
+ import IDE.Utils.Tool (ToolOutput(..))
+ import IDE.Utils.GUIUtils (__, chooseDir)
+ import IDE.Core.State (PackageAction, readIDE, prefs, ipdBuildDir, getMainWindow,
diff --git a/patches/leksah/0.13.4.3/series b/patches/leksah/0.13.4.3/series
new file mode 100644
index 0000000..2eeeb9e
--- /dev/null
+++ b/patches/leksah/0.13.4.3/series
@@ -0,0 +1 @@
+bump-deps
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list