[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 ad421d3d3ecf1f42cb07aef10ad20592e1111546
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 11:38:15 2006 +0100

    Fixing build problems

diff --git a/MissingH.cabal b/MissingH.cabal
index a9b2f15..0c5d481 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -5,6 +5,7 @@ License: GPL
 Maintainer: John Goerzen <jgoerzen at complete.org>
 Stability: Beta
 Copyright: Copyright (c) 2004-2006 John Goerzen
+Hs-Source-Dirs: src
 Exposed-Modules: Data.String, System.IO, System.IO.Binary, Data.List.Utils,
   System.Daemon,
   Text.ParserCombinators.Parsec.Utils,
@@ -17,21 +18,21 @@ Exposed-Modules: Data.String, System.IO, System.IO.Binary, Data.List.Utils,
   Network.Email.Sendmail,
   Language.RFC2234.Parse, Language.RFC2821.Parse, 
     Language.RFC2822.Parse,
-  MissingH.Regex.Pesco,
-    Data.String.CSV,
+  Text.Regex.PerlOps,
+    Data.CSV,
   System.Cmd.Utils,
   Data.Progress.Tracker,
   Data.Progress.Meter,
   Data.Quantity,
   Data.Map.Utils, System.Path, System.Path.NameManip,
-    System.Path.FilePath, System.Path.WildMatch, System.Path.Glob,
-  System.Time.Utils, System.Time.Utils.ParseDate,
+    System.Path.WildMatch, System.Path.Glob,
+  System.Time.Utils, System.Time.ParseDate,
   Network.Utils,
     Network.FTP.Client,
     Network.FTP.Client.Parser,
     Network.FTP.Server,
     Network.FTP.Server.Parser,
-  Network.Utils.SocketServer,
+  Network.SocketServer,
   Data.Either.Utils,
   Data.Maybe.Utils,
   Data.ConfigFile,
@@ -43,8 +44,6 @@ Exposed-Modules: Data.String, System.IO, System.IO.Binary, Data.List.Utils,
    Data.Hash.MD5, Data.Hash.MD5.Zord64_HARD,
   Data.Compression.Inflate,
   System.FileArchive.GZip,
-  Control.Concurrent.Thread.Utils.Child, Control.Concurrent.Thread.Utils.Timeout,
-  System.IO.BlockIO,
   System.IO.HVFS,
     System.IO.HVFS.Combinators,
     System.IO.HVFS.InstanceHelpers,
@@ -54,8 +53,6 @@ Exposed-Modules: Data.String, System.IO, System.IO.Binary, Data.List.Utils,
   Network.Email.Parser,
   System.Debian, System.Debian.ControlParser,
   Data.MIME.Types,
-  MissingH.Wash.Mail.Email,
-    MissingH.Wash.Mail.EmailConfig,
     Network.Email.Message.HeaderField,
     Network.Email.Message.MIME,
     Network.Email.Message.Parser,
diff --git a/src/Data/CSV.hs b/src/Data/CSV.hs
index 1dbd284..3972cbc 100644
--- a/src/Data/CSV.hs
+++ b/src/Data/CSV.hs
@@ -17,8 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : Data.String.CSV
-   Copyright  : Copyright (C) 2005 John Goerzen
+   Module     : Data.CSV
+   Copyright  : Copyright (C) 2005-2006 John Goerzen
    License    : GNU GPL, version 2 or above
 
    Maintainer : John Goerzen <jgoerzen at complete.org>
@@ -30,7 +30,7 @@ Haskell Parsec parsers for comma-separated value (CSV) files.
 Written by John Goerzen, jgoerzen\@complete.org
 -}
 
-module Data.String.CSV(csvFile, genCsvFile) where
+module Data.CSV(csvFile, genCsvFile) where
 import Text.ParserCombinators.Parsec
 import Data.List
 
diff --git a/src/Network/SocketServer.hs b/src/Network/SocketServer.hs
index 6b07907..85c0498 100644
--- a/src/Network/SocketServer.hs
+++ b/src/Network/SocketServer.hs
@@ -17,8 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 -}
 
 {- |
-   Module     : Network.Utils.SocketServer
-   Copyright  : Copyright (C) 2004 John Goerzen
+   Module     : Network.SocketServer
+   Copyright  : Copyright (C) 2004-2006 John Goerzen
    License    : GNU GPL, version 2 or above
 
    Maintainer : John Goerzen <jgoerzen at complete.org> 
@@ -36,7 +36,7 @@ This module is presently under-documented.  For an example of usage, please
 see the description of "Network.FTP.Server".
 -}
 
-module Network.Utils.SocketServer(-- * Generic Options and Types
+module Network.SocketServer(-- * Generic Options and Types
                                      InetServerOptions(..),
                                      simpleTCPOptions,
                                      SocketServer(..),
diff --git a/src/System/Time/ParseDate.hs b/src/System/Time/ParseDate.hs
index c4c4a18..6e8e642 100644
--- a/src/System/Time/ParseDate.hs
+++ b/src/System/Time/ParseDate.hs
@@ -1,5 +1,5 @@
 {- |
-   Module      : System.Time.Utils.ParseDate
+   Module      : System.Time.ParseDate
    Copyright   : (c) by Björn Bringert
    License     : GPL2
 
@@ -9,7 +9,7 @@
 
 Utility for parsing dates.
 -}
-module System.Time.Utils.ParseDate (parseCalendarTime) where
+module System.Time.ParseDate (parseCalendarTime) where
 
 import Control.Monad
 import Data.Char (isSpace)
diff --git a/src/System/Time/Utils.hs b/src/System/Time/Utils.hs
index 2ec6e4b..2b4e271 100644
--- a/src/System/Time/Utils.hs
+++ b/src/System/Time/Utils.hs
@@ -140,4 +140,5 @@ renderTD itd =
           quantlist = (\(TimeDiff y mo d h m s _) -> [y, mo, d, h, m, s]) td
           zippedlist = zip quantlist suffixlist
           -- Drop all leading elements that are 0, then take at most 2
-          workinglist = take 2 . dropWhile (\(q, _) -> q == 0) $ zippedlist
\ No newline at end of file
+          workinglist = take 2 . dropWhile (\(q, _) -> q == 0) $ zippedlist
+
diff --git a/src/Text/Regex/PerlOps.lhs b/src/Text/Regex/PerlOps.lhs
index ab74ba7..83da086 100644
--- a/src/Text/Regex/PerlOps.lhs
+++ b/src/Text/Regex/PerlOps.lhs
@@ -41,7 +41,7 @@ escape characters.
 {-# OPTIONS -fglasgow-exts #-}
 {- | Documentation for this module can be found in the doc directory in the MissingH distribution. | -}
 
-module MissingH.Regex.Pesco
+module Text.Regex.PerlOps
     (  Regex (match)       -- type class
     ,  Match (..)          -- data type
     ,  Subst               -- type class

-- 
haskell-testpack