[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit b3f8951284f24c8f3c5d47d8a9c4a15665c17779
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 11:05:18 2006 +0100

    Renamed MissingH.Wash.Mail.Message to Network.Email.Message

diff --git a/MissingH.cabal b/MissingH.cabal
index 23e374b..7a09d51 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -59,7 +59,7 @@ Exposed-Modules: Data.String, System.IO, System.IO.Binary, Data.List.Utils,
     Network.Email.Message.HeaderField,
     MissingH.Wash.Mail.MIME,
     Network.Email.Message.Parser,
-    MissingH.Wash.Mail.Message,
+    Network.Email.Message,
   MissingH.Wash.Utility.Auxiliary,
     MissingH.Wash.Utility.Base32,
     MissingH.Wash.Utility.Base64,
diff --git a/MissingH/Wash/Mail/Message.hs b/src/Network/Email/Message.hs
similarity index 98%
rename from MissingH/Wash/Mail/Message.hs
rename to src/Network/Email/Message.hs
index aec73e3..3261086 100644
--- a/MissingH/Wash/Mail/Message.hs
+++ b/src/Network/Email/Message.hs
@@ -1,4 +1,4 @@
-module MissingH.Wash.Mail.Message where
+module Network.Email.Message where
 
 import Network.Email.Message.HeaderField
 
diff --git a/src/Network/Email/Message/Parser.hs b/src/Network/Email/Message/Parser.hs
index 22b17a3..60c1fc7 100644
--- a/src/Network/Email/Message/Parser.hs
+++ b/src/Network/Email/Message/Parser.hs
@@ -12,7 +12,7 @@ import qualified MissingH.Wash.Utility.Base64 as Base64
 import qualified MissingH.Wash.Utility.QuotedPrintable as QuotedPrintable
 import qualified MissingH.Wash.Utility.RFC2047 as RFC2047
 import MissingH.Wash.Utility.RFC2047 (p_token)
-import MissingH.Wash.Mail.Message
+import Network.Email.Message
 import Network.Email.Message.HeaderField
 
 parseMessageFromFile :: FilePath -> IO (Either ParseError RawMessage)
diff --git a/src/Network/Email/Parser.hs b/src/Network/Email/Parser.hs
index 60ac144..bd86e4c 100644
--- a/src/Network/Email/Parser.hs
+++ b/src/Network/Email/Parser.hs
@@ -37,23 +37,23 @@ import Language.RFC2234.Parse(crlf)
 import Language.RFC2822.Parse hiding (Message)
 import Network.Email.Message.Parser(RawMessage(..), digestMessage)
 import Network.Email.Message.HeaderField(Header(..))
-import qualified MissingH.Wash.Mail.Message
+import qualified Network.Email.Message
 import Text.ParserCombinators.Parsec
 import Control.Monad.Error
 import Text.ParserCombinators.Parsec.Error
 import Text.ParserCombinators.Parsec.Pos(newPos)
 import Data.String
 
-{- | Given a 'MissingH.Wash.Mail.Message.Message' object, \"flatten\"
+{- | Given a 'Network.Email.Message.Message' object, \"flatten\"
 it into a simple, non-hierarchical list of its component single parts.
 
 Data associated with a multipart will be lost, but each single child component
 of the multipart will be preserved.
 -}
-flattenMessage :: MissingH.Wash.Mail.Message.Message -> 
-                  [MissingH.Wash.Mail.Message.Message]
+flattenMessage :: Network.Email.Message.Message -> 
+                  [Network.Email.Message.Message]
 flattenMessage x =
     case x of
-       y@(MissingH.Wash.Mail.Message.Singlepart {}) -> [y]
-       y@(MissingH.Wash.Mail.Message.Multipart {}) ->
-           concatMap flattenMessage (MissingH.Wash.Mail.Message.getParts y)
+       y@(Network.Email.Message.Singlepart {}) -> [y]
+       y@(Network.Email.Message.Multipart {}) ->
+           concatMap flattenMessage (Network.Email.Message.getParts y)

-- 
haskell-testpack