[Pkg-haskell-commits] r883 - in /packages/haskell-regex-base/branches/upstream/current: Text/Regex/Base.hs Text/Regex/Base/RegexLike.hs regex-base.cabal

[arjan at users.alioth.debian.org]

Author: arjan
Date: Sun Dec 30 21:26:23 2007
New Revision: 883

URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=883
Log:
[svn-upgrade] Integrating new upstream version, haskell-regex-base (0.92)

Modified:
    packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base.hs
    packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base/RegexLike.hs
    packages/haskell-regex-base/branches/upstream/current/regex-base.cabal

Modified: packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base.hs?rev=883&op=diff
==============================================================================
--- packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base.hs (original)
+++ packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base.hs Sun Dec 30 21:26:23 2007
@@ -53,6 +53,6 @@
 
 getVersion_Text_Regex_Base :: Version
 getVersion_Text_Regex_Base =
-  Version { versionBranch = [0,91]
+  Version { versionBranch = [0,92]
           , versionTags = ["unstable"]
           }

Modified: packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base/RegexLike.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base/RegexLike.hs?rev=883&op=diff
==============================================================================
--- packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base/RegexLike.hs (original)
+++ packages/haskell-regex-base/branches/upstream/current/Text/Regex/Base/RegexLike.hs Sun Dec 30 21:26:23 2007
@@ -39,7 +39,6 @@
   AllSubmatches(..),AllTextSubmatches(..),AllMatches(..),AllTextMatches(..)
   ) where
 
-import Control.Monad.Error()
 import Data.Array(Array,(!))
 import Data.Maybe(isJust)
 import qualified Data.ByteString as B (take,drop,empty,ByteString)
@@ -109,7 +108,7 @@
 
   makeRegex = makeRegexOpts defaultCompOpt defaultExecOpt
   makeRegexM = makeRegexOptsM defaultCompOpt defaultExecOpt
-  makeRegexOpts c e s = either error id (makeRegexOptsM c e s)
+  makeRegexOpts c e s = maybe (error "makeRegexOpts failed") id (makeRegexOptsM c e s)
   makeRegexOptsM c e s = return (makeRegexOpts c e s)
 
 ----------------

Modified: packages/haskell-regex-base/branches/upstream/current/regex-base.cabal
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-regex-base/branches/upstream/current/regex-base.cabal?rev=883&op=diff
==============================================================================
--- packages/haskell-regex-base/branches/upstream/current/regex-base.cabal (original)
+++ packages/haskell-regex-base/branches/upstream/current/regex-base.cabal Sun Dec 30 21:26:23 2007
@@ -1,5 +1,5 @@
 Name:                   regex-base
-Version:                0.91
+Version:                0.92
 -- Cabal-Version:       >=1.1.4
 License:                BSD3
 License-File:           LICENSE