[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 2e927cb1d863bcff88a6437eafb7ba2f2a53edfd
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Mar 15 22:19:01 2005 +0100

    checkpointing
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-207)

diff --git a/ChangeLog b/ChangeLog
index f8e49ba..1f5f87f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2005-03-15 15:19:01 GMT	John Goerzen <jgoerzen at complete.org>	patch-207
+
+    Summary:
+      checkpointing
+    Revision:
+      missingh--head--0.7--patch-207
+
+
+    modified files:
+     ChangeLog MissingH.cabal MissingH/Debian/ControlParser.hs
+     debian/changelog
+
+
 2005-03-15 01:04:52 GMT	John Goerzen <jgoerzen at complete.org>	patch-206
 
     Summary:
diff --git a/MissingH.cabal b/MissingH.cabal
index 6a302c5..ea13a7a 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -1,6 +1,6 @@
 -- arch-tag: MissingH main description file
 Name: MissingH
-Version: 0.9.0
+Version: 0.9.2
 License: GPL
 Maintainer: John Goerzen <jgoerzen at complete.org>
 Stability: Alpha
diff --git a/MissingH/Debian/ControlParser.hs b/MissingH/Debian/ControlParser.hs
index f8a9a3e..ad6f882 100644
--- a/MissingH/Debian/ControlParser.hs
+++ b/MissingH/Debian/ControlParser.hs
@@ -35,6 +35,7 @@ Written by John Goerzen, jgoerzen\@complete.org
 module MissingH.Debian.ControlParser(control, depPart)
     where
 import Text.ParserCombinators.Parsec
+import MissingH.Str
 
 eol = (try (string "\r\n"))
       <|> string "\n" <?> "EOL"
@@ -65,6 +66,13 @@ depPart = do packagename <- many1 (noneOf " (")
                             char ')'
                             return $ Just (op, vers)
                         ) <|> return Nothing
-             return (packagename, version)
+             archs <- (do many (char ' ')
+                          char '['
+                          t <- many1 (noneOf "]")
+                          many (char ' ')
+                          char ']'
+                          return (split " " t)
+                      ) <|> return []
+             return (packagename, version, archs)
 
              
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 8102cad..80522da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+missingh (0.9.2) unstable; urgency=low
+
+  * New modules: MissingH.Debian, MissingH.Debian.ControlParser
+  * Temporary changes to work with new Hugs
+
+ -- John Goerzen <jgoerzen at complete.org>  Tue, 15 Mar 2005 09:18:10 -0600
+
 missingh (0.9.1) unstable; urgency=low
 
   * ConfigParser: accept values that are empty

-- 
haskell-testpack