[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 5b0ac76da62ce7cf174073e0e2de81c8e4e1011d
Merge: 6b84eeb0350a0d78d1736a220ff45cc003d1e539 05f023d886c38107aaf9b0d2a35a369a21134699
Author: John Goerzen <jgoerzen at complete.org>
Date:   Wed Apr 5 20:22:52 2006 +0100

    Conflict resolution

diff --combined MissingH.cabal
index f913c68,52632a2..615f473
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@@ -1,10 -1,10 +1,10 @@@
  -- arch-tag: MissingH main description file
  Name: MissingH
--Version: 0.13.1
++Version: 0.13.2
  License: GPL
  Maintainer: John Goerzen <jgoerzen at complete.org>
  Stability: Beta
--Copyright: Copyright (c) 2004-2005 John Goerzen
++Copyright: Copyright (c) 2004-2006 John Goerzen
  Exposed-Modules: MissingH.Str, MissingH.IO, MissingH.IO.Binary, MissingH.List,
    MissingH.Daemon,
    MissingH.Parsec,
@@@ -82,8 -82,8 +82,8 @@@
  Extensions: ExistentialQuantification, AllowOverlappingInstances,
      AllowUndecidableInstances, CPP
  Build-Depends: haskell-src, network, parsec, base,
 -               unix,
 +               unix, HUnit,
-                haskell98, mtl
+                haskell98, mtl, HUnit
  GHC-Options: -O2
  
  Executable: runtests
diff --combined debian/changelog
index 19b19e6,287fecc..83c2fe9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
- missingh (0.13.1) unstable; urgency=low
++missingh (0.13.2) unstable; urgency=low
 +
 +  * New function splitWs
 +
 + -- John Goerzen <jgoerzen at complete.org>  Tue,  4 Apr 2006 05:31:15 -0500
 +
+ missingh (0.13.1) unstable; urgency=low
+ 
+   * Note Build-Depends on HUnit in MissingH.Cabal.  Closes: #356196.
+   * MissingH.IO.HVIO: No longer return EOFError when vGetContents called
+     at EOF, for compatibility with hGetContents.  Reported by
+     Bulat Ziganshin.
+   * MissingH.IO.HVFS.Utils: Applied suggestion from Bulat
+     to make recursiveRemove cleaner.
+   * MissingH.IO.HVIO: Minor bugfixes suggested by Bulat.
+   * Updated, fixed typos, and enhanced various docs.
+   * testsrc/Listtest: Added unit tests for spanList
+   * MissingH.List: Replaced implementation of spanList with one
+     suggested by Bulat.
+   * Added ghc6 (>= 6.4.1) to Debian build-depends.
+ 
+  -- John Goerzen <jgoerzen at complete.org>  Sat, 11 Mar 2006 12:26:03 -0600
+ 
  missingh (0.13.0) unstable; urgency=low
  
    * This release introduces some API changes that will affect 

-- 
haskell-testpack