[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:47 UTC 2010 

The following commit has been merged in the master branch:
commit 52257805b3c298b8eee85fc9c573f918e012cb2d
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 09:55:35 2006 +0100

    Finish renaming MissingH.IO tree

diff --git a/MissingH.cabal b/MissingH.cabal
index 52c24fa..b538c69 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -5,7 +5,7 @@ License: GPL
 Maintainer: John Goerzen <jgoerzen at complete.org>
 Stability: Beta
 Copyright: Copyright (c) 2004-2006 John Goerzen
-Exposed-Modules: MissingH.Str, MissingH.IO, System.IO.Binary, MissingH.List,
+Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, MissingH.List,
   System.Daemon,
   MissingH.Parsec,
   Test.HUnit.Utils,
@@ -49,7 +49,7 @@ Exposed-Modules: MissingH.Str, MissingH.IO, System.IO.Binary, MissingH.List,
     System.IO.HVFS.Combinators,
     System.IO.HVFS.InstanceHelpers,
     System.IO.HVFS.Utils,
-  System.IO.HVIO, MissingH.IO.StatCompat, MissingH.IO.WindowsCompat,
+  System.IO.HVIO, System.IO.StatCompat, System.IO.WindowsCompat,
     System.IO.PlafCompat, System.IO.Posix.Consts,
   Network.Email.Parser,
   System.Debian, System.Debian.ControlParser,
diff --git a/MissingH/MIMETypes.hs b/MissingH/MIMETypes.hs
index 55e11ce..5944f47 100644
--- a/MissingH/MIMETypes.hs
+++ b/MissingH/MIMETypes.hs
@@ -49,7 +49,7 @@ import qualified System.Directory
 import Monad
 import System.IO
 import System.IO.Error
-import MissingH.IO
+import System.IO
 import MissingH.Path
 import MissingH.Map
 import Data.Char
diff --git a/MissingH/Network/FTP/Server.hs b/MissingH/Network/FTP/Server.hs
index 67ec4af..ef13480 100644
--- a/MissingH/Network/FTP/Server.hs
+++ b/MissingH/Network/FTP/Server.hs
@@ -99,7 +99,7 @@ import Data.Char
 import Data.IORef
 import Data.List
 import Control.Exception(finally)
-import MissingH.IO
+import System.IO
 
 data DataType = ASCII | Binary
               deriving (Eq, Show)
diff --git a/MissingH/IO.hs b/src/System/IO.hs
similarity index 99%
rename from MissingH/IO.hs
rename to src/System/IO.hs
index ac66f5e..1acb570 100644
--- a/MissingH/IO.hs
+++ b/src/System/IO.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.IO
+   Module     : System.IO
    Copyright  : Copyright (C) 2004-2005 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 asdf.
 -}
 
-module MissingH.IO(-- * Entire File Handle Utilities
+module System.IO(-- * Entire File Handle Utilities
                        -- ** Opened Handle Data Copying
                        hCopy, hCopyProgress, hLineCopy, lineCopy,
                        -- ** Disk File Data Copying
diff --git a/src/System/IO/Binary.hs b/src/System/IO/Binary.hs
index df4e666..48b47be 100644
--- a/src/System/IO/Binary.hs
+++ b/src/System/IO/Binary.hs
@@ -53,7 +53,7 @@ is the support status:
 
  * Hugs: partial (maybe complete; needs more testing)
 
-Non-binary functions may be found in "MissingH.IO".
+Non-binary functions may be found in "System.IO".
 
 See also: "System.IO.BlockIO"
 
diff --git a/src/System/IO/PlafCompat.hs b/src/System/IO/PlafCompat.hs
index 61af1ef..dee8f89 100644
--- a/src/System/IO/PlafCompat.hs
+++ b/src/System/IO/PlafCompat.hs
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 On Unix, exports System.Posix.Types and System.Posix.Files.
 
-On Windows, exports System.Posix.Types and "MissingH.IO.WindowsCompat".
+On Windows, exports System.Posix.Types and "System.IO.WindowsCompat".
 
 The result should be roughly the same set of defined variables and types.
 
@@ -37,7 +37,7 @@ The result should be roughly the same set of defined variables and types.
 module System.IO.PlafCompat
     (nullFileName,
 #ifdef mingw32_HOST_OS
-     module MissingH.IO.WindowsCompat,
+     module System.IO.WindowsCompat,
 #else
      module System.Posix.Files,
 #endif
@@ -46,7 +46,7 @@ where
 
 import System.Posix.Types
 #ifdef mingw32_HOST_OS
-import MissingH.IO.WindowsCompat
+import System.IO.WindowsCompat
 #else
 import System.Posix.Files
 #endif
diff --git a/MissingH/IO/StatCompat.hs b/src/System/IO/StatCompat.hs
similarity index 94%
rename from MissingH/IO/StatCompat.hs
rename to src/System/IO/StatCompat.hs
index b48b2d9..e3663bc 100644
--- a/MissingH/IO/StatCompat.hs
+++ b/src/System/IO/StatCompat.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.IO.StatCompat
+   Module     : System.IO.StatCompat
    Copyright  : Copyright (C) 2005-2006 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    Portability: portable
 
 Provide a stat-like structure for use in MissingH.  Especially
-useful with HVFS and on Windows.  See also "MissingH.IO.WindowsCompat".
+useful with HVFS and on Windows.  See also "System.IO.WindowsCompat".
 
 Copyright (c) 2005-2006 John Goerzen, jgoerzen\@complete.org
 -}
 
-module MissingH.IO.StatCompat 
+module System.IO.StatCompat 
 where
 import System.Posix.Types
 import System.IO.PosixConsts
diff --git a/MissingH/IO/WindowsCompat.hs b/src/System/IO/WindowsCompat.hs
similarity index 91%
rename from MissingH/IO/WindowsCompat.hs
rename to src/System/IO/WindowsCompat.hs
index 182224c..01896f4 100644
--- a/MissingH/IO/WindowsCompat.hs
+++ b/src/System/IO/WindowsCompat.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : MissingH.IO.WindowsCompat
+   Module     : System.IO.WindowsCompat
    Copyright  : Copyright (C) 2005 John Goerzen
    License    : GNU GPL, version 2 or above
 
@@ -29,13 +29,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Provides some types and related items on Windows to be compatible with
 the System.Posix.* libraries
 
-See also "MissingH.IO.StatCompat", which this module re-exports.
+See also "System.IO.StatCompat", which this module re-exports.
 
 Copyright (c) 2005 John Goerzen, jgoerzen\@complete.org
 
 On non-Windows platforms, this module does nothing.
 
-On Windows, it re-exports "MissingH.IO.StatCompat".  It also provides various
+On Windows, it re-exports "System.IO.StatCompat".  It also provides various
 file type information modes that are otherwise in "System.Posix.Types" or
 "System.Posix.Files".  It also provides
 a rudimentary implemention of getFileStatus that emulates the Posix call
@@ -45,7 +45,7 @@ Common usage might be like this:
 
 >import System.Posix.Types
 >#ifdef mingw32_HOST_OS
->import MissingH.IO.WindowsCompat
+>import System.IO.WindowsCompat
 >#else
 >import System.Posix.Files
 >#endif
@@ -55,16 +55,16 @@ Or, to avoid having to use CPP and make things even easier, just import
 
 -}
 
-module MissingH.IO.WindowsCompat
+module System.IO.WindowsCompat
 #ifndef mingw32_HOST_OS
 where
 #else
-       (module MissingH.IO.StatCompat, module MissingH.IO.WindowsCompat)
+       (module System.IO.StatCompat, module System.IO.WindowsCompat)
 where
 
 import System.Posix.Types
 import Data.Bits
-import MissingH.IO.StatCompat
+import System.IO.StatCompat
 import System.IO.PosixConsts
 import MissingH.Time
 import System.Directory
diff --git a/testsrc/IOtest.hs b/testsrc/IOtest.hs
index 9cc2216..f4a55ba 100644
--- a/testsrc/IOtest.hs
+++ b/testsrc/IOtest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 module IOtest() where
 import Test.HUnit
-import MissingH.IO
+import System.IO
 import Test.HUnit.Utils
 
 

-- 
haskell-testpack

More information about the Pkg-haskell-commits mailing list