[DHG_packages] 01/01: lambdabot: patch for newer dependent-map

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository DHG_packages.

commit 297be3828f2d27ecaf3e7d730cae4141f09d8866
Author: Clint Adams <clint at debian.org>
Date:   Sun May 22 11:40:11 2016 -0400

    lambdabot: patch for newer dependent-map
---
 p/lambdabot/debian/changelog                   |  8 +++-
 p/lambdabot/debian/patches/newer-dependent-map | 52 ++++++++++++++++++++++++++
 p/lambdabot/debian/patches/series              |  1 +
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/p/lambdabot/debian/changelog b/p/lambdabot/debian/changelog
index 0d37b1c..63f3c9e 100644
--- a/p/lambdabot/debian/changelog
+++ b/p/lambdabot/debian/changelog
@@ -1,9 +1,13 @@
-lambdabot (5.0.3-4) UNRELEASED; urgency=medium
+lambdabot (5.0.3-4) unstable; urgency=medium
 
+  [ Dmitry Bogatov ]
   * Use secure (https) uri in Vcs-Git field in 'debian/control'
   * Bump standards version to 3.9.8 (no changes needed)
 
- -- Dmitry Bogatov <KAction at gnu.org>  Tue, 10 May 2016 09:36:40 +0300
+  [ Clint Adams ]
+  * Patch for newer dependent-map.  closes: #824352.
+
+ -- Clint Adams <clint at debian.org>  Sun, 22 May 2016 11:21:23 -0400
 
 lambdabot (5.0.3-3) unstable; urgency=medium
 
diff --git a/p/lambdabot/debian/patches/newer-dependent-map b/p/lambdabot/debian/patches/newer-dependent-map
new file mode 100644
index 0000000..7ebc8a0
--- /dev/null
+++ b/p/lambdabot/debian/patches/newer-dependent-map
@@ -0,0 +1,52 @@
+--- a/src/Main.hs
++++ b/src/Main.hs
+@@ -11,13 +11,14 @@
+ import Control.Applicative
+ import Control.Monad
+ import Data.Char
++import Data.Functor.Identity (Identity(..))
+ import Data.Version
+ import System.Console.GetOpt
+ import System.Environment
+ import System.Exit
+ import System.IO
+ 
+-flags :: [OptDescr (IO (DSum Config))]
++flags :: [OptDescr (IO (DSum Config Identity))]
+ flags = 
+     [ Option "h?" ["help"]  (NoArg (usage []))                      "Print this help message"
+     , Option "e"  []        (arg "<command>" onStartupCmds   strs)  "Run a lambdabot command instead of a REPL"
+@@ -27,8 +28,8 @@
+     , Option "X"  []        (arg "<extension>" languageExts strs)   "Set a GHC language extension for @run"
+     , Option "n"  ["nice"]  (NoArg noinsult)                        "Be nice (disable insulting error messages)"
+     ] where 
+-        arg :: String -> Config t -> (String -> IO t) -> ArgDescr (IO (DSum Config))
+-        arg descr key fn = ReqArg (fmap (key :=>) . fn) descr
++        arg :: String -> Config t -> (String -> IO t) -> ArgDescr (IO (DSum Config Identity))
++        arg descr key fn = ReqArg (fmap ((key :=>) . return) . fn) descr
+         
+         strs = return . (:[])
+         
+@@ -39,7 +40,7 @@
+                 , "Valid levels are: " ++ show [DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY]
+                 ]
+         
+-        noinsult = return (enableInsults :=> False)
++        noinsult = return (enableInsults :=> return False)
+ 
+ versionString :: String
+ versionString = ("lambdabot version " ++ showVersion P.version)
+@@ -72,11 +73,11 @@
+     config' <- sequence config
+     dir <- P.getDataDir
+     exitWith <=< lambdabotMain modulesInfo $
+-        [dataDir :=> dir, lbVersion :=> P.version] ++ config'
++        [dataDir :=> return dir, lbVersion :=> return P.version] ++ config'
+ 
+ -- special online target for ghci use
+ online :: [String] -> IO ()
+ online strs = do
+     dir <- P.getDataDir
+     void $ lambdabotMain modulesInfo
+-        [dataDir :=> dir, lbVersion :=> P.version, onStartupCmds :=> strs]
++        [dataDir :=> return dir, lbVersion :=> return P.version, onStartupCmds :=> return strs]
diff --git a/p/lambdabot/debian/patches/series b/p/lambdabot/debian/patches/series
new file mode 100644
index 0000000..b4c4258
--- /dev/null
+++ b/p/lambdabot/debian/patches/series
@@ -0,0 +1 @@
+newer-dependent-map

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git