[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 323a012752fc5b5e970723c161574e4d61757ec4
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 10:02:15 2006 +0100

    Renamed MissingH.Network to Network.Utils, refs #1

diff --git a/MissingH.cabal b/MissingH.cabal
index a6ed32a..b33f4d0 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -26,12 +26,12 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, Data.List.Utils,
   Data.Map.Utils, MissingH.Path, MissingH.Path.NameManip,
     MissingH.Path.FilePath, MissingH.Path.WildMatch, MissingH.Path.Glob,
   MissingH.Time, MissingH.Time.ParseDate,
-  MissingH.Network,
+  Network.Utils,
     Network.FTP.Client,
     Network.FTP.Client.Parser,
     Network.FTP.Server,
     Network.FTP.Server.Parser,
-  MissingH.Network.SocketServer,
+  Network.Utils.SocketServer,
   Data.Either.Utils,
   Data.Maybe.Utils,
   Data.ConfigFile,
diff --git a/MissingH/Network/SocketServer.hs b/MissingH/Network/SocketServer.hs
index 4893ce4..6b07907 100644
--- a/MissingH/Network/SocketServer.hs
+++ b/MissingH/Network/SocketServer.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Network.SocketServer
+   Module     : Network.Utils.SocketServer
    Copyright  : Copyright (C) 2004 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -36,7 +36,7 @@ This module is presently under-documented.  For an example of usage, please
 see the description of "Network.FTP.Server".
 -}
 
-module MissingH.Network.SocketServer(-- * Generic Options and Types
+module Network.Utils.SocketServer(-- * Generic Options and Types
                                      InetServerOptions(..),
                                      simpleTCPOptions,
                                      SocketServer(..),
@@ -56,7 +56,7 @@ module MissingH.Network.SocketServer(-- * Generic Options and Types
 where
 import Network.Socket
 import Network.BSD
-import MissingH.Network
+import Network.Utils
 import Control.Concurrent
 import System.IO
 import qualified System.Log.Logger
diff --git a/src/Network/FTP/Client.hs b/src/Network/FTP/Client.hs
index 7af4717..aa85732 100644
--- a/src/Network/FTP/Client.hs
+++ b/src/Network/FTP/Client.hs
@@ -229,7 +229,7 @@ import qualified Network
 import System.IO
 import System.IO.Unsafe
 import System.Log.Logger
-import MissingH.Network
+import Network.Utils
 import MissingH.Str
 data FTPConnection = FTPConnection {readh :: IO String,
                                     writeh :: Handle,
diff --git a/src/Network/FTP/Server.hs b/src/Network/FTP/Server.hs
index 4eeac31..c53be5e 100644
--- a/src/Network/FTP/Server.hs
+++ b/src/Network/FTP/Server.hs
@@ -43,7 +43,7 @@ as a filesystem.  It does this by using the
 "System.IO.HVFS" and "System.IO.HVIO" modules.
 
 In addition, basic networking and multitasking configuration is handled
-via "MissingH.Network.SocketServer" and logging via 
+via "Network.Utils.SocketServer" and logging via 
 "System.Log.Logger".
 
 This module is believed to be secure, but it not believed to be robust enough
@@ -56,7 +56,7 @@ Here is an example server that serves up the entire local filesystem
 in a read-only manner:
 
 >import Network.FTP.Server
->import MissingH.Network.SocketServer
+>import Network.Utils.SocketServer
 >import System.Log.Logger
 >import System.IO.HVFS
 >import System.IO.HVFS.Combinators
@@ -87,8 +87,8 @@ import qualified Network
 import System.IO
 import System.IO.Error
 import System.Log.Logger
-import MissingH.Network
-import MissingH.Network.SocketServer
+import Network.Utils
+import Network.Utils.SocketServer
 import MissingH.Str
 import System.IO.HVIO
 import System.IO.HVFS
@@ -139,7 +139,7 @@ sendReply h codei text =
         writethis (map (rstrip) (lines text))
 
 {- | Main FTP handler; pass the result of applying this to one argument to 
-'MissingH.Network.SocketServer.handleHandler' -}
+'Network.Utils.SocketServer.handleHandler' -}
 
 anonFtpHandler :: forall a. HVFSOpenable a => a -> Handle -> SockAddr -> SockAddr -> IO ()
 anonFtpHandler f h saremote salocal =
diff --git a/MissingH/Network.hs b/src/Network/Utils.hs
similarity index 96%
rename from MissingH/Network.hs
rename to src/Network/Utils.hs
index 07e6da2..1d35747 100644
--- a/MissingH/Network.hs
+++ b/src/Network/Utils.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Network
+   Module     : Network.Utils
    Copyright  : Copyright (C) 2004-2005 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -31,7 +31,7 @@ Written by John Goerzen, jgoerzen\@complete.org
 
 -}
 
-module MissingH.Network(niceSocketsDo, connectTCP, connectTCPAddr,
+module Network.Utils(niceSocketsDo, connectTCP, connectTCPAddr,
                         listenTCPAddr, showSockAddr
                        )
 where
diff --git a/testsrc/Network/FTP/Parsertest.hs b/testsrc/Network/FTP/Parsertest.hs
index 585df65..9be0b89 100644
--- a/testsrc/Network/FTP/Parsertest.hs
+++ b/testsrc/Network/FTP/Parsertest.hs
@@ -1,4 +1,4 @@
-{- arch-tag: MissingH.Network.FTP.Parser tests main file
+{- arch-tag: Network.Utils.FTP.Parser tests main file
 Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
 
 This program is free software; you can redistribute it and/or modify

-- 
haskell-testpack