[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 9c67e8b294b5e878168cb9da4335816b99858a96
Author: John Goerzen <jgoerzen at complete.org>
Date:   Wed Oct 20 08:14:47 2004 +0100

    Added WASHMail
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--1.0--patch-76)

diff --git a/COPYRIGHT b/COPYRIGHT
index db9a068..6ce3d1f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -29,5 +29,12 @@ The MissingH.Hsemail modules are:
   Copyright (c) 2004 Peter Simons <simons at cryp.to>. All rights reserved. This
   software is released under the terms of the GNU General Public License.
 
+I (John Goerzen) have made these modifications:
+
+ * Module names adjusted to work with MissingH, and to not conflict
+   with user-installed copies of hsemail
+
+ * Some files from the source distribution are not relevant to MissingH
+   and were removed.
 
 arch-tag: copyright statement
diff --git a/ChangeLog b/ChangeLog
index 4c71243..eb4a956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,26 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
 #
 
+2004-10-20 02:14:47 GMT	John Goerzen <jgoerzen at complete.org>	patch-76
+
+    Summary:
+      Added WASHMail
+    Revision:
+      missingh--head--1.0--patch-76
+
+
+    new files:
+     libsrc/MissingH/WASHMail/.arch-ids/=id
+
+    modified files:
+     COPYRIGHT ChangeLog libsrc/MissingH/Hsemail/Rfc2234.hs
+     libsrc/MissingH/Hsemail/Rfc2821.hs
+     libsrc/MissingH/Hsemail/Rfc2822.hs
+
+    new directories:
+     libsrc/MissingH/WASHMail libsrc/MissingH/WASHMail/.arch-ids
+
+
 2004-10-20 02:10:02 GMT	John Goerzen <jgoerzen at complete.org>	patch-75
 
     Summary:
diff --git a/libsrc/MissingH/Hsemail/Rfc2234.hs b/libsrc/MissingH/Hsemail/Rfc2234.hs
index e9e0579..b16de04 100644
--- a/libsrc/MissingH/Hsemail/Rfc2234.hs
+++ b/libsrc/MissingH/Hsemail/Rfc2234.hs
@@ -17,7 +17,7 @@
      avoid conflict with the function of the same name from Parsec.
 -}
 
-module Rfc2234
+module MissingH.Hsemail.Rfc2234
     ( -- * Parser Combinators
       caseChar, caseString, manyN, manyNtoM
 
diff --git a/libsrc/MissingH/Hsemail/Rfc2821.hs b/libsrc/MissingH/Hsemail/Rfc2821.hs
index ea857f0..a4cec1c 100644
--- a/libsrc/MissingH/Hsemail/Rfc2821.hs
+++ b/libsrc/MissingH/Hsemail/Rfc2821.hs
@@ -14,7 +14,7 @@
    document.
 -}
 
-module Rfc2821
+module MissingH.Hsemail.Rfc2821
   ( -- * Data Types for SMTP Commands
     SmtpCmd(..), Mailbox(..), nullPath, postmaster
 
@@ -46,7 +46,7 @@ import Control.Monad.State
 import Text.ParserCombinators.Parsec
 import Text.ParserCombinators.Parsec.Error
 import Data.List ( intersperse )
-import Rfc2234
+import MissingH.Hsemail.Rfc2234
 
 ----- Smtp Parsers ---------------------------------------------------
 
diff --git a/libsrc/MissingH/Hsemail/Rfc2822.hs b/libsrc/MissingH/Hsemail/Rfc2822.hs
index 93c43fa..f21d5a0 100644
--- a/libsrc/MissingH/Hsemail/Rfc2822.hs
+++ b/libsrc/MissingH/Hsemail/Rfc2822.hs
@@ -17,13 +17,13 @@
    example -- are genuinely useful.
 -}
 
-module Rfc2822 where
+module MissingH.Hsemail.Rfc2822 where
 
 import Text.ParserCombinators.Parsec
 import Data.Char ( ord )
 import Data.List ( intersperse )
 import System.Time
-import Rfc2234 hiding ( quoted_pair, quoted_string )
+import MissingH.Hsemail.Rfc2234 hiding ( quoted_pair, quoted_string )
 
 -- * Useful parser combinators
 

-- 
haskell-testpack