[DHG_packages] 09/09: lambdabot: Upgrading from 5.0.3 to 5.1

[Clint Adams]

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

clint pushed a commit to branch experimental
in repository DHG_packages.

commit d468f40583112a837a6bf23bc4385ba1952b9a57
Author: Clint Adams <clint at debian.org>
Date:   Wed Oct 19 20:30:09 2016 -0400

    lambdabot: Upgrading from 5.0.3 to 5.1
---
 p/lambdabot/debian/changelog                   |  6 +++
 p/lambdabot/debian/control                     | 34 +++++++++--------
 p/lambdabot/debian/patches/newer-dependent-map | 52 --------------------------
 p/lambdabot/debian/patches/series              |  1 -
 4 files changed, 24 insertions(+), 69 deletions(-)

diff --git a/p/lambdabot/debian/changelog b/p/lambdabot/debian/changelog
index c6231ac..5477e75 100644
--- a/p/lambdabot/debian/changelog
+++ b/p/lambdabot/debian/changelog
@@ -1,3 +1,9 @@
+lambdabot (5.1-1) experimental; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Wed, 19 Oct 2016 20:30:08 -0400
+
 lambdabot (5.0.3-5) experimental; urgency=medium
 
   [ Dmitry Bogatov ]
diff --git a/p/lambdabot/debian/control b/p/lambdabot/debian/control
index 61c0f50..19f31a7 100644
--- a/p/lambdabot/debian/control
+++ b/p/lambdabot/debian/control
@@ -6,23 +6,25 @@ Priority: optional
 Section: net
 Build-Depends:
  cdbs,
- debhelper (>= 9),
+ debhelper (>= 10),
  ghc (>= 8),
- haskell-devscripts (>= 0.10),
- libghc-lambdabot-core-dev (<< 5.1),
- libghc-lambdabot-core-dev (>= 5.0.3),
- libghc-lambdabot-haskell-plugins-dev (<< 5.1),
- libghc-lambdabot-haskell-plugins-dev (>= 5.0.3),
- libghc-lambdabot-irc-plugins-dev (<< 5.1),
- libghc-lambdabot-irc-plugins-dev (>= 5.0.3),
- libghc-lambdabot-misc-plugins-dev (<< 5.1),
- libghc-lambdabot-misc-plugins-dev (>= 5.0.1),
- libghc-lambdabot-novelty-plugins-dev (<< 5.1),
- libghc-lambdabot-novelty-plugins-dev (>= 5.0.3),
- libghc-lambdabot-reference-plugins-dev (<< 5.1),
- libghc-lambdabot-reference-plugins-dev (>= 5.0.3),
- libghc-lambdabot-social-plugins-dev (<< 5.1),
- libghc-lambdabot-social-plugins-dev (>= 5.0.1),
+ ghc-prof,
+ haskell-devscripts (>= 0.9),
+ libghc-lambdabot-core-dev (<< 5.2),
+ libghc-lambdabot-core-dev (>= 5.1),
+ libghc-lambdabot-haskell-plugins-dev (<< 5.2),
+ libghc-lambdabot-haskell-plugins-dev (>= 5.1),
+ libghc-lambdabot-irc-plugins-dev (<< 5.2),
+ libghc-lambdabot-irc-plugins-dev (>= 5.1),
+ libghc-lambdabot-misc-plugins-dev (<< 5.2),
+ libghc-lambdabot-misc-plugins-dev (>= 5.1),
+ libghc-lambdabot-novelty-plugins-dev (<< 5.2),
+ libghc-lambdabot-novelty-plugins-dev (>= 5.1),
+ libghc-lambdabot-reference-plugins-dev (<< 5.2),
+ libghc-lambdabot-reference-plugins-dev (>= 5.1),
+ libghc-lambdabot-social-plugins-dev (<< 5.2),
+ libghc-lambdabot-social-plugins-dev (>= 5.1),
+ libghc-mtl-dev (>= 2),
 Standards-Version: 3.9.8
 Homepage: http://hackage.haskell.org/package/lambdabot
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/lambdabot
diff --git a/p/lambdabot/debian/patches/newer-dependent-map b/p/lambdabot/debian/patches/newer-dependent-map
deleted file mode 100644
index 7ebc8a0..0000000
--- a/p/lambdabot/debian/patches/newer-dependent-map
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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
deleted file mode 100644
index b4c4258..0000000
--- a/p/lambdabot/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-dependent-map

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