[Pkg-haskell-commits] darcs: washngo: Build against parsec3

[Joachim Breitner]

Thu Jun  2 21:17:56 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Build against parsec3 
  Ignore-this: 97c3f9f2e5140520495b00057904c722

    M ./changelog +6
    M ./control -2 +2
    A ./patches/
    A ./patches/parsec3-compat
    A ./patches/series

Thu Jun  2 21:17:56 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Build against parsec3 
  Ignore-this: 97c3f9f2e5140520495b00057904c722
diff -rN -u old-washngo//changelog new-washngo//changelog
--- old-washngo//changelog	2011-06-02 21:35:51.653370985 +0000
+++ new-washngo//changelog	2011-06-02 21:35:51.665274536 +0000
@@ -1,3 +1,9 @@
+washngo (2.12.0.1-6) UNRELEASED; urgency=low
+
+  * Build against parsec3 
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 02 Jun 2011 23:02:50 +0200
+
 washngo (2.12.0.1-5) unstable; urgency=low
 
   [ Marco Silva ]
diff -rN -u old-washngo//control new-washngo//control
--- old-washngo//control	2011-06-02 21:35:51.653370985 +0000
+++ new-washngo//control	2011-06-02 21:35:51.661277409 +0000
@@ -10,8 +10,8 @@
   , ghc-prof
   , libghc-regex-compat-dev
   , libghc-regex-compat-prof
-  , libghc-parsec2-dev
-  , libghc-parsec2-prof
+  , libghc-parsec3-dev
+  , libghc-parsec3-prof
   , libghc-ghc-paths-dev
   , libghc-ghc-paths-prof
 Standards-Version: 3.9.2
diff -rN -u old-washngo//patches/parsec3-compat new-washngo//patches/parsec3-compat
--- old-washngo//patches/parsec3-compat	1970-01-01 00:00:00.000000000 +0000
+++ new-washngo//patches/parsec3-compat	2011-06-02 21:35:51.661277409 +0000
@@ -0,0 +1,61 @@
+Description: Add type signatures to allow building against parsec3
+Author: Joachim Breitner <nomeata at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- washngo-2.12.0.1.orig/WashNGo.cabal
++++ washngo-2.12.0.1/WashNGo.cabal
+@@ -21,7 +21,7 @@ Cabal-Version: >= 1.2
+ --  location: http://code.haskell.org/WASH/
+ 
+ Library
+-  Build-Depends: base < 5, regex-compat, haskell98, parsec < 3
++  Build-Depends: base < 5, regex-compat, haskell98, parsec >= 3
+   Extensions: ForeignFunctionInterface
+   build-depends: containers
+   Exposed-Modules:
+--- washngo-2.12.0.1.orig/WASH/Mail/MailParser.hs
++++ washngo-2.12.0.1/WASH/Mail/MailParser.hs
+@@ -38,6 +38,7 @@ literalString = do char '\"'
+ 		   return str
+ 
+ no_ws_ctl_chars = map chr ([1..8] ++ [11,12] ++ [14..31] ++ [127])
++no_ws_ctl :: Parser Char
+ no_ws_ctl = oneOf no_ws_ctl_chars
+ 
+ text_chars = map chr ([1..9] ++ [11,12] ++ [14..127])
+--- washngo-2.12.0.1.orig/WASH/Mail/RFC2822.hs
++++ washngo-2.12.0.1/WASH/Mail/RFC2822.hs
+@@ -14,8 +14,11 @@ fws =
+   do crLf
+      many1 ws1
+ 
++ws1 :: Parser Char
+ ws1 = oneOf " \t"
++lineChar :: Parser Char
+ lineChar = noneOf "\n\r"
++headerNameChar :: Parser Char
+ headerNameChar = noneOf "\n\r:"
+ 
+ -- |parse contents of Date field according to RFC2822
+--- washngo-2.12.0.1.orig/washparser/hs/WASHParser.hs
++++ washngo-2.12.0.1/washparser/hs/WASHParser.hs
+@@ -49,6 +49,7 @@ xmlfile = do {
+ 
+ 
+ -- 2.2 / 2
++char' :: Parser Char;
+ char' = (char '\t' <|> char '\n' <|> char '\r' <|> 
+     satisfy (>= ' ')) <?> "character";
+ 
diff -rN -u old-washngo//patches/series new-washngo//patches/series
--- old-washngo//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-washngo//patches/series	2011-06-02 21:35:51.661277409 +0000
@@ -0,0 +1 @@
+parsec3-compat