[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 6b2c8d387397872c8877634bbaa905948ca94910
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 12:32:45 2006 +0100

    More renaming fixes

diff --git a/MissingH.cabal b/MissingH.cabal
index 2aebf3e..38625de 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -49,7 +49,7 @@ Exposed-Modules: Data.String, System.IO, System.IO.Binary, Data.List.Utils,
     System.IO.HVFS.InstanceHelpers,
     System.IO.HVFS.Utils,
   System.IO.HVIO, System.IO.StatCompat, System.IO.WindowsCompat,
-    System.IO.PlafCompat, System.IO.Posix.Consts,
+    System.IO.PlafCompat, System.Posix.Consts,
   Network.Email.Parser,
   System.Debian, System.Debian.ControlParser,
   Data.MIME.Types,
diff --git a/src/Network/FTP/Server.hs b/src/Network/FTP/Server.hs
index eba1d08..889ef60 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 "Network.Utils.SocketServer" and logging via 
+via "Network.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 Network.Utils.SocketServer
+>import Network.SocketServer
 >import System.Log.Logger
 >import System.IO.HVFS
 >import System.IO.HVFS.Combinators
@@ -88,7 +88,7 @@ import System.IO
 import System.IO.Error
 import System.Log.Logger
 import Network.Utils
-import Network.Utils.SocketServer
+import Network.SocketServer
 import Data.String
 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 
-'Network.Utils.SocketServer.handleHandler' -}
+'Network.SocketServer.handleHandler' -}
 
 anonFtpHandler :: forall a. HVFSOpenable a => a -> Handle -> SockAddr -> SockAddr -> IO ()
 anonFtpHandler f h saremote salocal =
diff --git a/src/System/IO/StatCompat.hs b/src/System/IO/StatCompat.hs
index e3663bc..dbec98c 100644
--- a/src/System/IO/StatCompat.hs
+++ b/src/System/IO/StatCompat.hs
@@ -35,7 +35,7 @@ Copyright (c) 2005-2006 John Goerzen, jgoerzen\@complete.org
 module System.IO.StatCompat 
 where
 import System.Posix.Types
-import System.IO.PosixConsts
+import System.Posix.Consts
 #ifndef mingw32_HOST_OS
 import System.Posix.Files(intersectFileModes)
 #endif
diff --git a/src/System/IO/Posix/Consts.hs b/src/System/Posix/Consts.hs
similarity index 95%
rename from src/System/IO/Posix/Consts.hs
rename to src/System/Posix/Consts.hs
index d7b5b5a..0e5559d 100644
--- a/src/System/IO/Posix/Consts.hs
+++ b/src/System/Posix/Consts.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : System.IO.Posix.Consts
+   Module     : System.Posix.Consts
    Copyright  : Copyright (C) 2005 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -31,7 +31,7 @@ by default.
 
 -}
 
-module System.IO.Posix.Consts where
+module System.Posix.Consts where
 import System.Posix.Types
 
 blockSpecialMode :: FileMode

-- 
haskell-testpack