[Pkg-haskell-commits] [package-plan] 07/07: Remove patches from obsolete packages
Joachim Breitner
nomeata at moszumanska.debian.org
Sun Dec 21 22:12:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch ghc-7.8
in repository package-plan.
commit e28be866d57c7f8961424e2ef47f05d5074a1988
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Sun Dec 21 23:12:26 2014 +0100
Remove patches from obsolete packages
---
patches/process-conduit/1.1.0.0/newer-conduit.diff | 19 ------
patches/process-conduit/1.1.0.0/series | 1 -
patches/rss2irc/1.0.5/newer-http-conduit.diff | 31 ----------
patches/rss2irc/1.0.5/series | 1 -
patches/rss2irc/1.0.6/newer-libraries.diff | 15 -----
patches/rss2irc/1.0.6/series | 1 -
patches/tokyocabinet-haskell/0.0.5/ghc-7.4.1-fix | 11 ----
patches/tokyocabinet-haskell/0.0.5/series | 1 -
patches/weighted-regexp/0.3.1.2/eq-constraints | 69 ----------------------
patches/weighted-regexp/0.3.1.2/series | 1 -
patches/yesod-markdown/0.8.5/newer-temporary | 13 ----
patches/yesod-markdown/0.8.5/series | 1 -
12 files changed, 164 deletions(-)
diff --git a/patches/process-conduit/1.1.0.0/newer-conduit.diff b/patches/process-conduit/1.1.0.0/newer-conduit.diff
deleted file mode 100644
index ef86210..0000000
--- a/patches/process-conduit/1.1.0.0/newer-conduit.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/process-conduit.cabal
-+++ b/process-conduit.cabal
-@@ -48,4 +48,6 @@
- , bytestring
- , hspec >= 1.3
- , conduit
-+ , conduit-extra
- , process-conduit
-+ , resourcet
---- a/test.hs
-+++ b/test.hs
-@@ -3,6 +3,7 @@
- import Data.Conduit.Process
- import System.Process.QQ
-
-+import Control.Monad.Trans.Resource (runResourceT)
- import qualified Data.ByteString.Lazy.Char8 as L
- import Data.Conduit
- import qualified Data.Conduit.Binary as CB
diff --git a/patches/process-conduit/1.1.0.0/series b/patches/process-conduit/1.1.0.0/series
deleted file mode 100644
index cc66eba..0000000
--- a/patches/process-conduit/1.1.0.0/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-conduit.diff
diff --git a/patches/rss2irc/1.0.5/newer-http-conduit.diff b/patches/rss2irc/1.0.5/newer-http-conduit.diff
deleted file mode 100644
index 0caf89a..0000000
--- a/patches/rss2irc/1.0.5/newer-http-conduit.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/rss2irc.cabal
-+++ b/rss2irc.cabal
-@@ -36,7 +36,7 @@
- ,deepseq
- ,irc >= 0.5 && < 0.6
- ,feed >= 0.3.8 && < 0.3.9.2
-- ,http-conduit >= 1.9 && < 2.0
-+ ,http-conduit >= 1.9 && < 2.1
- ,resourcet >= 0.4.4 && < 0.5
- ,http-types >= 0.6.4 && < 0.9
- ,io-storage >= 0.3 && < 0.4
---- a/rss2irc.hs
-+++ b/rss2irc.hs
-@@ -18,7 +18,7 @@
- import Data.Time.Clock (getCurrentTime)
- import Prelude hiding (log)
- import Network (withSocketsDo)
--import Network.HTTP.Conduit (newManager, def)
-+import Network.HTTP.Conduit (newManager, conduitManagerSettings)
- import System.Console.CmdArgs
- import System.Exit (ExitCode(ExitSuccess), exitFailure, exitSuccess)
- import System.IO
-@@ -70,7 +70,7 @@
- withStore "globals" $ do -- for readFeedFile
- -- http-conduit stuff
- withSocketsDo $ do -- for ms windows
-- manager <- io $ newManager Network.HTTP.Conduit.def
-+ manager <- io $ newManager conduitManagerSettings
- (opts,reader,bot) <- getRss2IrcArgs
- let app = App{aOpts=opts,aReader=reader{httpManager=Just manager},aBot=bot}
- when (delay opts > 0) $ threadDelay $ (delay opts) * minutes
diff --git a/patches/rss2irc/1.0.5/series b/patches/rss2irc/1.0.5/series
deleted file mode 100644
index 05f8b5a..0000000
--- a/patches/rss2irc/1.0.5/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-http-conduit.diff
diff --git a/patches/rss2irc/1.0.6/newer-libraries.diff b/patches/rss2irc/1.0.6/newer-libraries.diff
deleted file mode 100644
index ca766b5..0000000
--- a/patches/rss2irc/1.0.6/newer-libraries.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/rss2irc.cabal
-+++ b/rss2irc.cabal
-@@ -36,9 +36,9 @@ executable rss2irc
- ,deepseq
- ,irc >= 0.5 && < 0.6
- ,feed >= 0.3.9 && < 0.3.10
-- ,http-client >= 0.2.1 && < 0.2.3
-- ,http-conduit >= 1.9 && < 2.1
-- ,resourcet >= 0.4.4 && < 0.5
-+ ,http-client >= 0.2.1
-+ ,http-conduit >= 1.9
-+ ,resourcet >= 0.4.4
- ,http-types >= 0.6.4 && < 0.9
- ,io-storage >= 0.3 && < 0.4
- ,network >= 2.4 && < 2.5
diff --git a/patches/rss2irc/1.0.6/series b/patches/rss2irc/1.0.6/series
deleted file mode 100644
index 20d5826..0000000
--- a/patches/rss2irc/1.0.6/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-libraries.diff
diff --git a/patches/tokyocabinet-haskell/0.0.5/ghc-7.4.1-fix b/patches/tokyocabinet-haskell/0.0.5/ghc-7.4.1-fix
deleted file mode 100644
index 0957f35..0000000
--- a/patches/tokyocabinet-haskell/0.0.5/ghc-7.4.1-fix
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Add language pragma, fixes building with GHC 7.4.1
-Author: Joachim Breitner <nomeata at debian.org>
-
---- tokyocabinet-haskell-0.0.5.orig/Database/TokyoCabinet/FDB/Key.hs
-+++ tokyocabinet-haskell-0.0.5/Database/TokyoCabinet/FDB/Key.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE TypeSynonymInstances #-}
-+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
- module Database.TokyoCabinet.FDB.Key (Key(..), ID(..)) where
-
- import Database.TokyoCabinet.FDB.C (ID(..), unID)
diff --git a/patches/tokyocabinet-haskell/0.0.5/series b/patches/tokyocabinet-haskell/0.0.5/series
deleted file mode 100644
index 4f3b6d4..0000000
--- a/patches/tokyocabinet-haskell/0.0.5/series
+++ /dev/null
@@ -1 +0,0 @@
-ghc-7.4.1-fix
diff --git a/patches/weighted-regexp/0.3.1.2/eq-constraints b/patches/weighted-regexp/0.3.1.2/eq-constraints
deleted file mode 100644
index 0dc22bb..0000000
--- a/patches/weighted-regexp/0.3.1.2/eq-constraints
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Add Eq instance constraint to semiring class
- Num no longer implies Eq, so we need this now.
-Author: Iain Lane <laney at debian.org>
-Forwarded: https://github.com/sebfisch/haskell-regexp/pull/22
-
-Index: haskell-weighted-regexp/src/Data/Semiring.hs
-===================================================================
---- haskell-weighted-regexp.orig/src/Data/Semiring.hs 2012-02-14 23:14:42.000000000 +0000
-+++ haskell-weighted-regexp/src/Data/Semiring.hs 2012-02-14 23:17:04.389795495 +0000
-@@ -82,5 +82,5 @@
- instance Show a => Show (Numeric a) where
- show = show . getNumeric
-
--instance Num a => Semiring (Numeric a) where
-+instance (Eq a, Num a) => Semiring (Numeric a) where
- zero = 0; one = 1; (.+.) = (+); (.*.) = (*)
-Index: haskell-weighted-regexp/src/Text/RegExp/Data.hs
-===================================================================
---- haskell-weighted-regexp.orig/src/Text/RegExp/Data.hs 2012-02-14 23:14:42.000000000 +0000
-+++ haskell-weighted-regexp/src/Text/RegExp/Data.hs 2012-02-14 23:17:04.389795495 +0000
-@@ -35,7 +35,7 @@
- instance Weight c c Bool where
- symWeight = defaultSymWeight
-
--instance Num a => Weight c c (Numeric a) where
-+instance (Eq a, Num a) => Weight c c (Numeric a) where
- symWeight = defaultSymWeight
-
- weighted :: Weight a b w => RegW w a -> RegW w b
-Index: haskell-weighted-regexp/src/Text/RegExp/Matching.hs
-===================================================================
---- haskell-weighted-regexp.orig/src/Text/RegExp/Matching.hs 2011-08-15 05:49:35.000000000 +0100
-+++ haskell-weighted-regexp/src/Text/RegExp/Matching.hs 2012-02-14 23:18:54.297493176 +0000
-@@ -30,7 +30,7 @@
- -- Computes in how many ways a word can be matched against a regular
- -- expression.
- --
--matchingCount :: Num a => RegExp c -> [c] -> a
-+matchingCount :: (Eq a, Num a) => RegExp c -> [c] -> a
- matchingCount r = getNumeric . fullMatch r
-
- {-# SPECIALIZE matchingCount :: RegExp c -> [c] -> Int #-}
-@@ -50,7 +50,7 @@
-
- {-# SPECIALIZE fullMatch :: RegExp c -> [c] -> Bool #-}
- {-# SPECIALIZE fullMatch :: RegExp c -> [c] -> Numeric Int #-}
--{-# SPECIALIZE fullMatch :: Num a => RegExp c -> [c] -> Numeric a #-}
-+{-# SPECIALIZE fullMatch :: (Eq a, Num a) => RegExp c -> [c] -> Numeric a #-}
- {-# SPECIALIZE fullMatch :: RegExp c -> [(Int,c)] -> Leftmost #-}
- {-# SPECIALIZE fullMatch :: RegExp c -> [c] -> Longest #-}
- {-# SPECIALIZE fullMatch :: RegExp c -> [(Int,c)] -> LeftLong #-}
-@@ -67,7 +67,7 @@
-
- {-# SPECIALIZE partialMatch :: RegExp c -> [c] -> Bool #-}
- {-# SPECIALIZE partialMatch :: RegExp c -> [c] -> Numeric Int #-}
--{-# SPECIALIZE partialMatch :: Num a => RegExp c -> [c] -> Numeric a #-}
-+{-# SPECIALIZE partialMatch :: (Eq a, Num a) => RegExp c -> [c] -> Numeric a #-}
- {-# SPECIALIZE partialMatch :: RegExp c -> [(Int,c)] -> Leftmost #-}
- {-# SPECIALIZE partialMatch :: RegExp c -> [c] -> Longest #-}
- {-# SPECIALIZE partialMatch :: RegExp c -> [(Int,c)] -> LeftLong #-}
-@@ -78,7 +78,7 @@
-
- {-# SPECIALIZE matchW :: RegW Bool c -> [c] -> Bool #-}
- {-# SPECIALIZE matchW :: RegW (Numeric Int) c -> [c] -> Numeric Int #-}
--{-# SPECIALIZE matchW :: Num a => RegW (Numeric a) c -> [c] -> Numeric a #-}
-+{-# SPECIALIZE matchW :: (Eq a, Num a) => RegW (Numeric a) c -> [c] -> Numeric a #-}
- {-# SPECIALIZE matchW :: RegW Leftmost (Int,c) -> [(Int,c)] -> Leftmost #-}
- {-# SPECIALIZE matchW :: RegW Longest c -> [c] -> Longest #-}
- {-# SPECIALIZE matchW :: RegW LeftLong (Int,c) -> [(Int,c)] -> LeftLong #-}
diff --git a/patches/weighted-regexp/0.3.1.2/series b/patches/weighted-regexp/0.3.1.2/series
deleted file mode 100644
index a80ceec..0000000
--- a/patches/weighted-regexp/0.3.1.2/series
+++ /dev/null
@@ -1 +0,0 @@
-eq-constraints
diff --git a/patches/yesod-markdown/0.8.5/newer-temporary b/patches/yesod-markdown/0.8.5/newer-temporary
deleted file mode 100644
index b0023fe..0000000
--- a/patches/yesod-markdown/0.8.5/newer-temporary
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: haskell-yesod-markdown-0.8.5/yesod-markdown.cabal
-===================================================================
---- haskell-yesod-markdown-0.8.5.orig/yesod-markdown.cabal 2014-05-09 17:22:23.000000000 +0200
-+++ haskell-yesod-markdown-0.8.5/yesod-markdown.cabal 2014-08-03 19:44:42.471263822 +0200
-@@ -26,7 +26,7 @@
- , yesod-form >= 1.3 && < 1.4
- , hamlet >= 1.1 && < 1.2
- , persistent >= 0.9
-- , temporary < 1.2.0.2
-+ , temporary >= 1.2.0.3
-
- ghc-options: -Wall
-
diff --git a/patches/yesod-markdown/0.8.5/series b/patches/yesod-markdown/0.8.5/series
deleted file mode 100644
index a41ccbf..0000000
--- a/patches/yesod-markdown/0.8.5/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-temporary
--
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