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

John Goerzen jgoerzen at complete.org
Fri Apr 23 15:17:35 UTC 2010 

The following commit has been merged in the master branch:
commit 2c0c03ba6eaf675d850c9870df23d52e539775d5
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 09:43:53 2006 +0100

    More renames

diff --git a/MissingH.cabal b/MissingH.cabal
index 090e7f8..2faec34 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -9,12 +9,12 @@ Exposed-Modules: MissingH.Str, MissingH.IO, MissingH.IO.Binary, MissingH.List,
   System.Daemon,
   MissingH.Parsec,
   MissingH.HUnit,
-  MissingH.Email.Mailbox,
+  Network.Email.Mailbox,
   MissingH.Logging, MissingH.Logging.Handler,
     MissingH.Logging.Handler.Simple, MissingH.Logging.Handler.Syslog,
     MissingH.Logging.Logger, 
   MissingH.Threads,
-  MissingH.Email.Sendmail,
+  Network.Email.Sendmail,
   MissingH.Hsemail.Rfc2234, MissingH.Hsemail.Rfc2821, 
     MissingH.Hsemail.Rfc2822,
   MissingH.Regex.Pesco,
@@ -32,7 +32,7 @@ Exposed-Modules: MissingH.Str, MissingH.IO, MissingH.IO.Binary, MissingH.List,
     MissingH.Network.FTP.Server,
     MissingH.Network.FTP.ParserServer,
   MissingH.Network.SocketServer,
-  MissingH.Either,
+  Data.Either.Utils,
   MissingH.Maybe,
   Data.ConfigFile,
     Data.ConfigFile.Types,
@@ -51,7 +51,7 @@ Exposed-Modules: MissingH.Str, MissingH.IO, MissingH.IO.Binary, MissingH.List,
     MissingH.IO.HVFS.Utils,
   MissingH.IO.HVIO, MissingH.IO.StatCompat, MissingH.IO.WindowsCompat,
     MissingH.IO.PlafCompat, MissingH.IO.PosixConsts,
-  MissingH.Email.Parser,
+  Network.Email.Parser,
   System.Debian, System.Debian.ControlParser,
   MissingH.MIMETypes,
   MissingH.Wash.Mail.Email,
diff --git a/src/Data/ConfigFile.hs b/src/Data/ConfigFile.hs
index e622be0..c264439 100644
--- a/src/Data/ConfigFile.hs
+++ b/src/Data/ConfigFile.hs
@@ -106,7 +106,7 @@ module Data.ConfigFile
 import Data.ConfigFile.Types
 import Data.ConfigFile.Parser
 import MissingH.Map
-import MissingH.Either
+import Data.Either.Utils
 import MissingH.Str
 import qualified Data.Map as Map
 import Data.List
@@ -718,9 +718,9 @@ more detail.
 
 Some people find it annoying to have to deal with errors manually.
 You can transform errors into exceptions in your code by using 
-'MissingH.Either.forceEither'.  Here's an example of this style of programming:
+'Data.Either.Utils.forceEither'.  Here's an example of this style of programming:
 
-> import MissingH.Either
+> import Data.Either.Utils
 > do
 >    val <- readfile emptyCP "/etc/foo.cfg"
 >    let cp = forceEither val
diff --git a/MissingH/Either.hs b/src/Data/Either/Utils.hs
similarity index 97%
rename from MissingH/Either.hs
rename to src/Data/Either/Utils.hs
index bf50094..53adbc6 100644
--- a/MissingH/Either.hs
+++ b/src/Data/Either/Utils.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Either
+   Module     : Data.Either.Utils
    Copyright  : Copyright (C) 2004-2006 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -29,7 +29,7 @@ Utilities for working with the Either data type
 
 Copyright (c) 2004 John Goerzen, jgoerzen\@complete.org
 -}
-module MissingH.Either
+module Data.Either.Utils
     (
      maybeToEither,
      forceEither,
diff --git a/MissingH/Email/Mailbox.hs b/src/Network/Email/Mailbox.hs
similarity index 96%
rename from MissingH/Email/Mailbox.hs
rename to src/Network/Email/Mailbox.hs
index 425fc28..689e107 100644
--- a/MissingH/Email/Mailbox.hs
+++ b/src/Network/Email/Mailbox.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Email.Mailbox
+   Module     : Network.Email.Mailbox
    Copyright  : Copyright (C) 2005 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -30,7 +30,7 @@ General support for e-mail mailboxes
 Written by John Goerzen, jgoerzen\@complete.org
 -}
 
-module MissingH.Email.Mailbox(Flag(..), Flags, Message,
+module Network.Email.Mailbox(Flag(..), Flags, Message,
                               MailboxReader(..),
                               MailboxWriter(..))
 where
diff --git a/MissingH/Email/Parser.hs b/src/Network/Email/Parser.hs
similarity index 96%
rename from MissingH/Email/Parser.hs
rename to src/Network/Email/Parser.hs
index 4e7ef83..aa4be28 100644
--- a/MissingH/Email/Parser.hs
+++ b/src/Network/Email/Parser.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Email.Parser
+   Module     : Network.Email.Parser
    Copyright  : Copyright (C) 2004 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -30,7 +30,7 @@ Parses an e-mail message
 Written by John Goerzen, jgoerzen\@complete.org
 -}
 
-module MissingH.Email.Parser(flattenMessage)
+module Network.Email.Parser(flattenMessage)
 where
 
 import MissingH.Hsemail.Rfc2234(crlf)
diff --git a/MissingH/Email/Sendmail.hs b/src/Network/Email/Sendmail.hs
similarity index 97%
rename from MissingH/Email/Sendmail.hs
rename to src/Network/Email/Sendmail.hs
index 4421053..c3f86fd 100644
--- a/MissingH/Email/Sendmail.hs
+++ b/src/Network/Email/Sendmail.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Email.Sendmail
+   Module     : Network.Email.Sendmail
    Copyright  : Copyright (C) 2004-2005 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -34,10 +34,10 @@ Written by John Goerzen, jgoerzen\@complete.org
 -}
 
 #ifdef mingw32_HOST_OS
-module MissingH.Email.Sendmail
+module Network.Email.Sendmail
 where
 #else
-module MissingH.Email.Sendmail(sendmail)
+module Network.Email.Sendmail(sendmail)
 where
 
 import System.Cmd.Utils
diff --git a/testsrc/ConfigParser/Maintest.hs b/testsrc/ConfigParser/Maintest.hs
index b165e16..ce4a155 100644
--- a/testsrc/ConfigParser/Maintest.hs
+++ b/testsrc/ConfigParser/Maintest.hs
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 module ConfigParser.Maintest(tests) where
 import Test.HUnit
 import Data.ConfigFile
-import MissingH.Either
+import Data.Either.Utils
 import MissingH.IO.PlafCompat(nullFileName)
 import MissingH.HUnit
 import Control.Exception
diff --git a/testsrc/Eithertest.hs b/testsrc/Eithertest.hs
index ebaaa1e..dc0ac24 100644
--- a/testsrc/Eithertest.hs
+++ b/testsrc/Eithertest.hs
@@ -1,4 +1,4 @@
-{- arch-tag: MissingH.Either tests
+{- arch-tag: Data.Either.Utils tests
 Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
 
 This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 module Eithertest(tests) where
 import Test.HUnit
-import MissingH.Either
+import Data.Either.Utils
 import MissingH.HUnit
 import Control.Exception
 
diff --git a/testsrc/GZiptest.hs b/testsrc/GZiptest.hs
index c8a1fd8..1280fc3 100644
--- a/testsrc/GZiptest.hs
+++ b/testsrc/GZiptest.hs
@@ -23,7 +23,7 @@ import MissingH.Path.FilePath
 import Data.Compression.Inflate
 import MissingH.IO.Binary
 import System.IO
-import MissingH.Either
+import Data.Either.Utils
 import Data.List
 
 mf fn exp conf = TestLabel fn $ TestCase $
@@ -34,7 +34,7 @@ mf fn exp conf = TestLabel fn $ TestCase $
 {-
 import MissingH.FileArchive.GZip
 import System.IO
-import MissingH.Either
+import Data.Either.Utils
 
 main = do
        c <- hGetContents stdin

-- 
haskell-testpack

More information about the Pkg-haskell-commits mailing list