[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 9747bac29e8bde043d349d2ab38796da3acb612e
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 09:51:44 2006 +0100

    More renaming

diff --git a/MissingH.cabal b/MissingH.cabal
index 2faec34..90d0f57 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -15,8 +15,8 @@ Exposed-Modules: MissingH.Str, MissingH.IO, MissingH.IO.Binary, MissingH.List,
     MissingH.Logging.Logger, 
   MissingH.Threads,
   Network.Email.Sendmail,
-  MissingH.Hsemail.Rfc2234, MissingH.Hsemail.Rfc2821, 
-    MissingH.Hsemail.Rfc2822,
+  Language.RFC2234.Parse, Language.RFC2821.Parse, 
+    Language.RFC2822.Parse,
   MissingH.Regex.Pesco,
     MissingH.Str.CSV,
   System.Cmd.Utils,
@@ -80,7 +80,7 @@ Exposed-Modules: MissingH.Str, MissingH.IO, MissingH.IO.Binary, MissingH.List,
   Database.AnyDBM,
     Database.AnyDBM.MapDBM,
     Database.AnyDBM.StringDBM,
-  MissingH.GetOpt
+  System.Console.GetOpt.Utils
 Extensions: ExistentialQuantification, OverlappingInstances, 
    UndecidableInstances, CPP
 Build-Depends: network, parsec, base,
diff --git a/MissingH/Network/FTP/ParserServer.hs b/MissingH/Network/FTP/ParserServer.hs
index 51b5e39..25c5732 100644
--- a/MissingH/Network/FTP/ParserServer.hs
+++ b/MissingH/Network/FTP/ParserServer.hs
@@ -49,7 +49,7 @@ import System.IO(Handle, hGetContents)
 import System.IO(hGetLine)
 import Text.Regex
 import Data.Word
-import MissingH.Hsemail.Rfc2234(alpha)
+import Language.RFC2234.Parse(alpha)
 import Data.Char
 
 logit :: String -> IO ()
diff --git a/MissingH/Hsemail/Rfc2234.hs b/src/Language/RFC2234/Parse.hs
similarity index 99%
rename from MissingH/Hsemail/Rfc2234.hs
rename to src/Language/RFC2234/Parse.hs
index 99ffb00..66785d0 100644
--- a/MissingH/Hsemail/Rfc2234.hs
+++ b/src/Language/RFC2234/Parse.hs
@@ -14,7 +14,7 @@
    here to avoid conflicts with Parsec's 'char' function.
  -}
 
-module MissingH.Hsemail.Rfc2234 where
+module Language.RFC2234.Parse where
 
 import Text.ParserCombinators.Parsec
 import Data.Char ( toUpper, chr, ord )
diff --git a/MissingH/Hsemail/Rfc2821.hs b/src/Language/RFC2821/Parse.hs
similarity index 99%
rename from MissingH/Hsemail/Rfc2821.hs
rename to src/Language/RFC2821/Parse.hs
index a3cc85f..e630bb8 100644
--- a/MissingH/Hsemail/Rfc2821.hs
+++ b/src/Language/RFC2821/Parse.hs
@@ -13,7 +13,7 @@
    <http://www.faqs.org/rfcs/rfc2821.html>.
 -}
 
-module MissingH.Hsemail.Rfc2821 where
+module Language.RFC2821.Parse where
 
 import Control.Exception ( assert )
 import Control.Monad.State
@@ -22,7 +22,7 @@ import Text.ParserCombinators.Parsec.Error
 import Data.List ( intersperse )
 import Data.Char ( toLower )
 import Data.Typeable
-import MissingH.Hsemail.Rfc2234
+import Language.RFC2234.Parse
 
 ----------------------------------------------------------------------
 -- * ESMTP State Machine
diff --git a/MissingH/Hsemail/Rfc2822.hs b/src/Language/RFC2822/Parse.hs
similarity index 99%
rename from MissingH/Hsemail/Rfc2822.hs
rename to src/Language/RFC2822/Parse.hs
index 7ba922f..33b5837 100644
--- a/MissingH/Hsemail/Rfc2822.hs
+++ b/src/Language/RFC2822/Parse.hs
@@ -17,13 +17,13 @@
    example -- are genuinely useful.
 -}
 
-module MissingH.Hsemail.Rfc2822 where
+module Language.RFC2822.Parse where
 
 import Text.ParserCombinators.Parsec
 import Data.Char ( ord )
 import Data.List ( intersperse )
 import System.Time
-import MissingH.Hsemail.Rfc2234
+import Language.RFC2234.Parse
         hiding ( quoted_pair, quoted_string )
 
 -- * Useful parser combinators
diff --git a/src/Network/Email/Parser.hs b/src/Network/Email/Parser.hs
index aa4be28..f57bf0d 100644
--- a/src/Network/Email/Parser.hs
+++ b/src/Network/Email/Parser.hs
@@ -33,8 +33,8 @@ Written by John Goerzen, jgoerzen\@complete.org
 module Network.Email.Parser(flattenMessage)
 where
 
-import MissingH.Hsemail.Rfc2234(crlf)
-import MissingH.Hsemail.Rfc2822 hiding (Message)
+import Language.RFC2234.Parse(crlf)
+import Language.RFC2822.Parse hiding (Message)
 import MissingH.Wash.Mail.MailParser(RawMessage(..), digestMessage)
 import MissingH.Wash.Mail.HeaderField(Header(..))
 import qualified MissingH.Wash.Mail.Message
diff --git a/MissingH/GetOpt.hs b/src/System/Console/GetOpt/Utils.hs
similarity index 98%
rename from MissingH/GetOpt.hs
rename to src/System/Console/GetOpt/Utils.hs
index a7eb408..20f2431 100644
--- a/MissingH/GetOpt.hs
+++ b/src/System/Console/GetOpt/Utils.hs
@@ -30,7 +30,7 @@ Written by John Goerzen, jgoerzen\@complete.org
 Utilities for command-line parsing, including wrappers around
 the standard System.Console.GetOpt module.
 -}
-module MissingH.GetOpt (parseCmdLine,
+module System.Console.GetOpt.Utils (parseCmdLine,
                         validateCmdLine,
                         StdOption,
                         stdRequired,

-- 
haskell-testpack