[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 c215c37c49efd6af6eca35787704825c8f670e61
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 10:01:32 2006 +0100

    Renamed MissingH.Network.FTP.ParserClient to Network.FTP.Client.Parser, refs #1

diff --git a/MissingH.cabal b/MissingH.cabal
index ce09b18..54b6535 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -28,7 +28,7 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, Data.List.Utils,
   MissingH.Time, MissingH.Time.ParseDate,
   MissingH.Network,
     MissingH.Network.FTP.Client,
-    MissingH.Network.FTP.ParserClient,
+    Network.FTP.Client.Parser,
     MissingH.Network.FTP.Server,
     MissingH.Network.FTP.ParserServer,
   MissingH.Network.SocketServer,
diff --git a/MissingH/Network/FTP/Client.hs b/MissingH/Network/FTP/Client.hs
index 8996a10..608c21d 100644
--- a/MissingH/Network/FTP/Client.hs
+++ b/MissingH/Network/FTP/Client.hs
@@ -168,7 +168,7 @@ commands themselves./
 This will be fairly rare.  Just be aware of this.
 
 This module logs messages under @MissingH.Network.FTP.Client@ for outgoing
-traffic and @MissingH.Network.FTP.ParserClient@ for incoming traffic, all with the
+traffic and @Network.FTP.Client.Parser@ for incoming traffic, all with the
 'System.Log.DEBUG' priority, so by default, no log messages are seen.
 The 'enableFTPDebugging' function will adjust the priorities of these
 two handlers so debug messages are seen.  Only control channel conversations
@@ -221,7 +221,7 @@ module MissingH.Network.FTP.Client(-- * Establishing\/Removing connections
                                    retrlines, storlines
                        )
 where
-import MissingH.Network.FTP.ParserClient
+import Network.FTP.Client.Parser
 import Network.BSD
 import Network.Socket
 import System.IO.Binary
@@ -254,7 +254,7 @@ easyConnectFTP h = do x <- connectFTP h 21
                       return (fst x)
 
 {- | Enable logging of FTP messages through 'System.Log.Logger'.
-This sets the log levels of @MissingH.Network.FTP.ParserClient@ and
+This sets the log levels of @Network.FTP.Client.Parser@ and
 @MissingH.Network.FTP.Client@ to DEBUG.  By default, this means that
 full protocol dumps will be sent to stderr.
 
@@ -263,7 +263,7 @@ The effect is global and persists until changed.
 enableFTPDebugging :: IO ()
 enableFTPDebugging = 
     do
-    updateGlobalLogger "MissingH.Network.FTP.ParserClient" (setLevel DEBUG)
+    updateGlobalLogger "Network.FTP.Client.Parser" (setLevel DEBUG)
     updateGlobalLogger "MissingH.Network.FTP.Client" (setLevel DEBUG)
 
 {- | Connect to remote FTP server and read the welcome. -}
diff --git a/MissingH/Network/FTP/ParserServer.hs b/MissingH/Network/FTP/ParserServer.hs
index f9a9eac..5dbb7d8 100644
--- a/MissingH/Network/FTP/ParserServer.hs
+++ b/MissingH/Network/FTP/ParserServer.hs
@@ -37,7 +37,7 @@ module MissingH.Network.FTP.ParserServer(
                                          parseCommand
                                         )
 where
-import MissingH.Network.FTP.ParserClient
+import Network.FTP.Client.Parser
 import Text.ParserCombinators.Parsec
 import MissingH.Parsec
 import Data.List.Utils
diff --git a/MissingH/Network/FTP/Server.hs b/MissingH/Network/FTP/Server.hs
index a555b0a..d85207e 100644
--- a/MissingH/Network/FTP/Server.hs
+++ b/MissingH/Network/FTP/Server.hs
@@ -80,7 +80,7 @@ module MissingH.Network.FTP.Server(
                                   )
 where
 import MissingH.Network.FTP.ParserServer
-import MissingH.Network.FTP.ParserClient
+import Network.FTP.Client.Parser
 import Network.BSD
 import Network.Socket
 import qualified Network
diff --git a/renameit.sh b/renameit.sh
index 4bd26c1..975435f 100644
--- a/renameit.sh
+++ b/renameit.sh
@@ -44,6 +44,6 @@ do
         sed -i "s,`sedname ${OLDNAME}`,${NEWNAME},g" $FILE
 done
 
-#darcs record -am "Renamed ${OLDNAME} to ${NEWNAME}"
+darcs record -am "Renamed ${OLDNAME} to ${NEWNAME}, refs #1"
            
 
diff --git a/MissingH/Network/FTP/ParserClient.hs b/src/Network/FTP/Client/Parser.hs
similarity index 97%
rename from MissingH/Network/FTP/ParserClient.hs
rename to src/Network/FTP/Client/Parser.hs
index a6bdbde..1bd0ae5 100644
--- a/MissingH/Network/FTP/ParserClient.hs
+++ b/src/Network/FTP/Client/Parser.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.Network.FTP.ParserClient
+   Module     : Network.FTP.Client.Parser
    Copyright  : Copyright (C) 2004 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -33,7 +33,7 @@ Written by John Goerzen, jgoerzen\@complete.org
 
 -}
 
-module MissingH.Network.FTP.ParserClient(parseReply, parseGoodReply,
+module Network.FTP.Client.Parser(parseReply, parseGoodReply,
                                          toPortString, fromPortString,
                                          debugParseGoodReply,
                                          respToSockAddr,
@@ -61,7 +61,7 @@ type FTPResult = (Int, [String])
 -- import Control.Exception(Exception(PatternMatchFail), throw)
 
 logit :: String -> IO ()
-logit m = debugM "MissingH.Network.FTP.ParserClient" ("FTP received: " ++ m)
+logit m = debugM "Network.FTP.Client.Parser" ("FTP received: " ++ m)
 
 ----------------------------------------------------------------------
 -- Utilities
diff --git a/testsrc/Network/FTP/Parsertest.hs b/testsrc/Network/FTP/Parsertest.hs
index daec83d..585df65 100644
--- a/testsrc/Network/FTP/Parsertest.hs
+++ b/testsrc/Network/FTP/Parsertest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 module Network.FTP.Parsertest(tests) where
 import Test.HUnit
-import MissingH.Network.FTP.ParserClient
+import Network.FTP.Client.Parser
 import Test.HUnit.Utils
 import Network.Socket
 

-- 
haskell-testpack