[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 14:46:00 UTC 2010 

The following commit has been merged in the master branch:
commit 0a6d16459b9a36cd4d7664a7c4d35a10073f9d1f
Author: John Goerzen <jgoerzen at complete.org>
Date:   Mon Oct 25 21:27:35 2004 +0100

    Merged local changes to Wash
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.5--patch-5)

diff --git a/ChangeLog b/ChangeLog
index 4d614ce..7574940 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,40 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.5
 #
 
+2004-10-25 15:27:35 GMT	John Goerzen <jgoerzen at complete.org>	patch-5
+
+    Summary:
+      Merged local changes to Wash
+    Revision:
+      missingh--head--0.5--patch-5
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Wash/Mail/Email.hs
+     libsrc/MissingH/Wash/Mail/EmailConfig.hs
+     libsrc/MissingH/Wash/Mail/HeaderField.hs
+     libsrc/MissingH/Wash/Mail/MIME.hs
+     libsrc/MissingH/Wash/Mail/MailParser.hs
+     libsrc/MissingH/Wash/Mail/Message.hs
+     libsrc/MissingH/Wash/Utility/Auxiliary.hs
+     libsrc/MissingH/Wash/Utility/Base32.hs
+     libsrc/MissingH/Wash/Utility/Base64.hs
+     libsrc/MissingH/Wash/Utility/FileNames.hs
+     libsrc/MissingH/Wash/Utility/Hex.hs
+     libsrc/MissingH/Wash/Utility/ISO8601.hs
+     libsrc/MissingH/Wash/Utility/IntToString.hs
+     libsrc/MissingH/Wash/Utility/JavaScript.hs
+     libsrc/MissingH/Wash/Utility/Locking.hs
+     libsrc/MissingH/Wash/Utility/QuotedPrintable.hs
+     libsrc/MissingH/Wash/Utility/RFC2047.hs
+     libsrc/MissingH/Wash/Utility/RFC2279.hs
+     libsrc/MissingH/Wash/Utility/RFC2397.hs
+     libsrc/MissingH/Wash/Utility/Shell.hs
+     libsrc/MissingH/Wash/Utility/SimpleParser.hs
+     libsrc/MissingH/Wash/Utility/URLCoding.hs
+     libsrc/MissingH/Wash/Utility/Unique.hs
+
+
 2004-10-25 15:25:36 GMT	John Goerzen <jgoerzen at complete.org>	patch-4
 
     Summary:
diff --git a/libsrc/MissingH/Wash/Mail/Email.hs b/libsrc/MissingH/Wash/Mail/Email.hs
index 4cde469..7f697ac 100644
--- a/libsrc/MissingH/Wash/Mail/Email.hs
+++ b/libsrc/MissingH/Wash/Mail/Email.hs
@@ -1,20 +1,21 @@
 -- © 2001, 2002 Peter Thiemann
-module Email (
+module MissingH.Wash.Mail.Email (
 	sendmail, inventMessageId, exitcodeToSYSEXIT, SYSEXIT(..),
-	module MIME, module HeaderField) where
+	module MissingH.Wash.Mail.MIME, 
+        module MissingH.Wash.Mail.HeaderField) where
 
 -- from standard library
 import IO
 import System
 
 -- from utility
-import Auxiliary
-import Unique
+import MissingH.Wash.Utility.Auxiliary
+import MissingH.Wash.Utility.Unique
 
 -- from package
-import EmailConfig
-import HeaderField
-import MIME
+import MissingH.Wash.Mail.EmailConfig
+import MissingH.Wash.Mail.HeaderField
+import MissingH.Wash.Mail.MIME
 
 -- |from sysexit.h
 data SYSEXIT =
diff --git a/libsrc/MissingH/Wash/Mail/EmailConfig.hs b/libsrc/MissingH/Wash/Mail/EmailConfig.hs
index da7e3ec..08cbb11 100644
--- a/libsrc/MissingH/Wash/Mail/EmailConfig.hs
+++ b/libsrc/MissingH/Wash/Mail/EmailConfig.hs
@@ -1,4 +1,4 @@
-module EmailConfig where
+module MissingH.Wash.Mail.EmailConfig where
 
 tmpDir, varDir, emailTmpDir, sendmailProgram :: String
 
diff --git a/libsrc/MissingH/Wash/Mail/HeaderField.hs b/libsrc/MissingH/Wash/Mail/HeaderField.hs
index 12ffb60..5666869 100644
--- a/libsrc/MissingH/Wash/Mail/HeaderField.hs
+++ b/libsrc/MissingH/Wash/Mail/HeaderField.hs
@@ -1,6 +1,6 @@
-module HeaderField where
+module MissingH.Wash.Mail.HeaderField where
 
-import RFC2047
+import MissingH.Wash.Utility.RFC2047
 
 -- 
 newtype Header = Header (String, String)
diff --git a/libsrc/MissingH/Wash/Mail/MIME.hs b/libsrc/MissingH/Wash/Mail/MIME.hs
index 6d847cd..8554de5 100644
--- a/libsrc/MissingH/Wash/Mail/MIME.hs
+++ b/libsrc/MissingH/Wash/Mail/MIME.hs
@@ -1,5 +1,5 @@
 -- © 2001, 2002 Peter Thiemann
-module MIME where
+module MissingH.Wash.Mail.MIME where
 -- RFC 2045
 -- RFC 2046
 
@@ -7,10 +7,11 @@ import IO
 import Random
 import Char
 
-import qualified Base64
-import qualified QuotedPrintable
-import HeaderField
-import qualified RFC2279				    -- UTF-8
+import qualified MissingH.Wash.Utility.Base64 as Base64
+import qualified MissingH.Wash.Utility.QuotedPrintable as QuotedPrintable
+import MissingH.Wash.Mail.HeaderField
+import qualified MissingH.Wash.Utility.RFC2279 as RFC2279
+-- UTF-8
 
 
 -- --------------------------------------------------------------------
diff --git a/libsrc/MissingH/Wash/Mail/MailParser.hs b/libsrc/MissingH/Wash/Mail/MailParser.hs
index a264b36..2f378d0 100644
--- a/libsrc/MissingH/Wash/Mail/MailParser.hs
+++ b/libsrc/MissingH/Wash/Mail/MailParser.hs
@@ -1,4 +1,4 @@
-module MailParser where
+module MissingH.Wash.Mail.MailParser where
 
 -- see RFC 2822
 -- TODO: check against their definition of token
@@ -6,13 +6,14 @@ import Char
 import List
 import Maybe
 -- 
-import Parsec
+import Text.ParserCombinators.Parsec
 -- 
-import qualified Base64
-import qualified QuotedPrintable
-import RFC2047 (p_token)
-import Message
-import HeaderField
+import qualified MissingH.Wash.Utility.Base64 as Base64
+import qualified MissingH.Wash.Utility.QuotedPrintable as QuotedPrintable
+import qualified MissingH.Wash.Utility.RFC2047 as RFC2047
+import MissingH.Wash.Utility.RFC2047 (p_token)
+import MissingH.Wash.Mail.Message
+import MissingH.Wash.Mail.HeaderField
 
 parseMessageFromFile fname =
   parseFromFile message fname
diff --git a/libsrc/MissingH/Wash/Mail/Message.hs b/libsrc/MissingH/Wash/Mail/Message.hs
index 08bc371..ee69abd 100644
--- a/libsrc/MissingH/Wash/Mail/Message.hs
+++ b/libsrc/MissingH/Wash/Mail/Message.hs
@@ -1,6 +1,6 @@
-module Message where
+module MissingH.Wash.Mail.Message where
 
-import HeaderField
+import MissingH.Wash.Mail.HeaderField
 
 data Message =
      Singlepart 
diff --git a/libsrc/MissingH/Wash/Utility/Auxiliary.hs b/libsrc/MissingH/Wash/Utility/Auxiliary.hs
index d6d85c7..15cab7a 100644
--- a/libsrc/MissingH/Wash/Utility/Auxiliary.hs
+++ b/libsrc/MissingH/Wash/Utility/Auxiliary.hs
@@ -1,10 +1,10 @@
-module Auxiliary where
+module MissingH.Wash.Utility.Auxiliary where
 
 import IO
 import System
 import Directory
-import FileNames
-import qualified Shell
+import MissingH.Wash.Utility.FileNames
+import qualified MissingH.Wash.Utility.Shell as Shell
 
 protectedGetEnv :: String -> String -> IO String
 protectedGetEnv var deflt =
diff --git a/libsrc/MissingH/Wash/Utility/Base32.hs b/libsrc/MissingH/Wash/Utility/Base32.hs
index 98898ee..dea78bf 100644
--- a/libsrc/MissingH/Wash/Utility/Base32.hs
+++ b/libsrc/MissingH/Wash/Utility/Base32.hs
@@ -2,7 +2,7 @@
 -- http://www.ietf.org/rfc/rfc3548.txt
 -- Author: Niklas Deutschmann
 
-module Base32 (encode, decode) where
+module MissingH.Wash.Utility.Base32 (encode, decode) where
 
 import Bits
 import Char
diff --git a/libsrc/MissingH/Wash/Utility/Base64.hs b/libsrc/MissingH/Wash/Utility/Base64.hs
index c55a4f1..afe6326 100644
--- a/libsrc/MissingH/Wash/Utility/Base64.hs
+++ b/libsrc/MissingH/Wash/Utility/Base64.hs
@@ -1,6 +1,6 @@
 -- © 2002 Peter Thiemann
 -- |Implements RFC 2045 MIME coding.
-module Base64
+module MissingH.Wash.Utility.Base64
        (encode, encode', decode, decode'
        ,alphabet_list
        )
diff --git a/libsrc/MissingH/Wash/Utility/FileNames.hs b/libsrc/MissingH/Wash/Utility/FileNames.hs
index ea99240..7a161db 100644
--- a/libsrc/MissingH/Wash/Utility/FileNames.hs
+++ b/libsrc/MissingH/Wash/Utility/FileNames.hs
@@ -1,4 +1,4 @@
-module FileNames where
+module MissingH.Wash.Utility.FileNames where
 
 longestSuffix :: (a -> Bool) -> [a] -> [a]
 longestSuffix p xs =
diff --git a/libsrc/MissingH/Wash/Utility/Hex.hs b/libsrc/MissingH/Wash/Utility/Hex.hs
index d1f1609..4da2185 100644
--- a/libsrc/MissingH/Wash/Utility/Hex.hs
+++ b/libsrc/MissingH/Wash/Utility/Hex.hs
@@ -1,5 +1,5 @@
 -- © 2001, 2003 Peter Thiemann
-module Hex where
+module MissingH.Wash.Utility.Hex where
 
 import Array
 import Char
diff --git a/libsrc/MissingH/Wash/Utility/ISO8601.hs b/libsrc/MissingH/Wash/Utility/ISO8601.hs
index 8f4f2c7..0df774e 100644
--- a/libsrc/MissingH/Wash/Utility/ISO8601.hs
+++ b/libsrc/MissingH/Wash/Utility/ISO8601.hs
@@ -1,14 +1,14 @@
 -- © 2002 Peter Thiemann
-module ISO8601 where
+module MissingH.Wash.Utility.ISO8601 where
 
 import Char
 import Monad
 import Time
 
-import IOExts
+import System.IO.Unsafe
 
-import IntToString
-import SimpleParser
+import MissingH.Wash.Utility.IntToString
+import MissingH.Wash.Utility.SimpleParser
 
 secondsToString seconds =
   intToString 20 seconds
diff --git a/libsrc/MissingH/Wash/Utility/IntToString.hs b/libsrc/MissingH/Wash/Utility/IntToString.hs
index 93f8a2a..ea0f497 100644
--- a/libsrc/MissingH/Wash/Utility/IntToString.hs
+++ b/libsrc/MissingH/Wash/Utility/IntToString.hs
@@ -1,5 +1,5 @@
 -- © 2002 Peter Thiemann
-module IntToString where
+module MissingH.Wash.Utility.IntToString where
 
 import Char
 
diff --git a/libsrc/MissingH/Wash/Utility/JavaScript.hs b/libsrc/MissingH/Wash/Utility/JavaScript.hs
index 26e54b8..ae9493e 100644
--- a/libsrc/MissingH/Wash/Utility/JavaScript.hs
+++ b/libsrc/MissingH/Wash/Utility/JavaScript.hs
@@ -1,9 +1,9 @@
 -- © 2003 Peter Thiemann
-module JavaScript where
+module MissingH.Wash.Utility.JavaScript where
 
 import Char
 
-import Hex
+import MissingH.Wash.Utility.Hex
 
 jsShow :: String -> String
 jsShow xs = '\'' : g xs
diff --git a/libsrc/MissingH/Wash/Utility/Locking.hs b/libsrc/MissingH/Wash/Utility/Locking.hs
index 569cfa8..46c7bf7 100644
--- a/libsrc/MissingH/Wash/Utility/Locking.hs
+++ b/libsrc/MissingH/Wash/Utility/Locking.hs
@@ -1,6 +1,6 @@
-module Locking (obtainLock, releaseLock) where
+module MissingH.Wash.Utility.Locking (obtainLock, releaseLock) where
 
-import Auxiliary
+import MissingH.Wash.Utility.Auxiliary
 import Directory
 import IO
 import System
diff --git a/libsrc/MissingH/Wash/Utility/QuotedPrintable.hs b/libsrc/MissingH/Wash/Utility/QuotedPrintable.hs
index 9a66f66..8d70333 100644
--- a/libsrc/MissingH/Wash/Utility/QuotedPrintable.hs
+++ b/libsrc/MissingH/Wash/Utility/QuotedPrintable.hs
@@ -1,10 +1,10 @@
-module QuotedPrintable 
+module MissingH.Wash.Utility.QuotedPrintable 
        (encode, encode', decode
        -- deprecated: encode_quoted, encode_quoted', decode_quoted
        ) where
 
 import Char
-import Hex
+import MissingH.Wash.Utility.Hex
 
 encode, encode', decode :: String -> String
 encode = encode_quoted
diff --git a/libsrc/MissingH/Wash/Utility/RFC2047.hs b/libsrc/MissingH/Wash/Utility/RFC2047.hs
index 1188514..a8548b6 100644
--- a/libsrc/MissingH/Wash/Utility/RFC2047.hs
+++ b/libsrc/MissingH/Wash/Utility/RFC2047.hs
@@ -1,12 +1,12 @@
-module RFC2047 where
+module MissingH.Wash.Utility.RFC2047 where
 -- decoding of header fields
 import Char
 import List
 
-import qualified Base64
-import qualified QuotedPrintable
-import Hex
-import Parsec
+import qualified MissingH.Wash.Utility.Base64 as Base64
+import qualified MissingH.Wash.Utility.QuotedPrintable as QuotedPrintable
+import MissingH.Wash.Utility.Hex
+import Text.ParserCombinators.Parsec
 
 lineString =
   do initial <- many (noneOf "\n\r=")
diff --git a/libsrc/MissingH/Wash/Utility/RFC2279.hs b/libsrc/MissingH/Wash/Utility/RFC2279.hs
index 1377ee9..d0a7470 100644
--- a/libsrc/MissingH/Wash/Utility/RFC2279.hs
+++ b/libsrc/MissingH/Wash/Utility/RFC2279.hs
@@ -10,7 +10,7 @@
   0020 0000-03FF FFFF   111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
   0400 0000-7FFF FFFF   1111110x 10xxxxxx ... 10xxxxxx
 -}
-module RFC2279 (encode, decode) where
+module MissingH.Wash.Utility.RFC2279 (encode, decode) where
 
 import Char
 
diff --git a/libsrc/MissingH/Wash/Utility/RFC2397.hs b/libsrc/MissingH/Wash/Utility/RFC2397.hs
index 0dbd15b..9b881c1 100644
--- a/libsrc/MissingH/Wash/Utility/RFC2397.hs
+++ b/libsrc/MissingH/Wash/Utility/RFC2397.hs
@@ -1,7 +1,10 @@
-module RFC2397 where
+module MissingH.Wash.Utility.RFC2397 where
 
-import URLCoding
-import Base64
+import MissingH.Wash.Utility.URLCoding
+import MissingH.Wash.Utility.Base64
+
+import qualified MissingH.Wash.Utility.Base64 as Base64
+import qualified MissingH.Wash.Utility.URLCoding as URLCoding
 
 data ENC = BASE64 | URL
   deriving Eq
diff --git a/libsrc/MissingH/Wash/Utility/Shell.hs b/libsrc/MissingH/Wash/Utility/Shell.hs
index fae193a..b2e8c82 100644
--- a/libsrc/MissingH/Wash/Utility/Shell.hs
+++ b/libsrc/MissingH/Wash/Utility/Shell.hs
@@ -1,6 +1,6 @@
 -- © 2002 Peter Thiemann
 -- |Defines functions for shell quotation.
-module Shell where
+module MissingH.Wash.Utility.Shell where
 
 import Char
 
diff --git a/libsrc/MissingH/Wash/Utility/SimpleParser.hs b/libsrc/MissingH/Wash/Utility/SimpleParser.hs
index 43890dc..7e78126 100644
--- a/libsrc/MissingH/Wash/Utility/SimpleParser.hs
+++ b/libsrc/MissingH/Wash/Utility/SimpleParser.hs
@@ -1,5 +1,5 @@
 -- © 2002 Peter Thiemann
-module SimpleParser where
+module MissingH.Wash.Utility.SimpleParser where
 
 import Char
 
diff --git a/libsrc/MissingH/Wash/Utility/URLCoding.hs b/libsrc/MissingH/Wash/Utility/URLCoding.hs
index 2b3d8d6..562b2f6 100644
--- a/libsrc/MissingH/Wash/Utility/URLCoding.hs
+++ b/libsrc/MissingH/Wash/Utility/URLCoding.hs
@@ -1,9 +1,9 @@
 -- © 2001, 2002 Peter Thiemann
 -- |Implements coding of non-alphanumeric characters in URLs and CGI-requests.
-module URLCoding (encode, decode) where
+module MissingH.Wash.Utility.URLCoding (encode, decode) where
 
 import Char
-import Hex
+import MissingH.Wash.Utility.Hex
 
 encode, decode :: String -> String
 encode = urlEncode
diff --git a/libsrc/MissingH/Wash/Utility/Unique.hs b/libsrc/MissingH/Wash/Utility/Unique.hs
index fefd85c..dfac033 100644
--- a/libsrc/MissingH/Wash/Utility/Unique.hs
+++ b/libsrc/MissingH/Wash/Utility/Unique.hs
@@ -1,13 +1,13 @@
 -- © 2001 Peter Thiemann
-module Unique (inventStdKey, inventKey, inventFilePath) where
+module MissingH.Wash.Utility.Unique (inventStdKey, inventKey, inventFilePath) where
 
 import Random
 import IO
 import Directory
-import Auxiliary
+import MissingH.Wash.Utility.Auxiliary
 import List
 import Monad
-import Locking
+import MissingH.Wash.Utility.Locking
 
 registryDir = "/tmp/Unique/"
 

-- 
haskell-testpack

More information about the Pkg-haskell-commits mailing list