[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 f55639258c1b46cb7b2918d91c50227ca12db1e4
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Feb 23 00:05:52 2007 +0100

    Revert conflict

diff --git a/debian/control b/debian/control
index 5b1b588..ac540ab 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Priority: optional
 Maintainer: John Goerzen <jgoerzen at complete.org>
 Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.6), ghc6 (<< 6.6-999), haskell-devscripts (>= 0.5.6), cpphs, libghc6-network-dev, libghc6-unix-dev, libghc6-mtl-dev, libghc6-hunit-dev, libghc6-quickcheck-dev, libghc6-filepath-dev, libghc6-hslogger-dev
 Build-Depends-Indep: debhelper (>= 4.0.0), haddock, hugs (>= 98.200503.08-4), haskell-devscripts (>= 0.5.6), ghc6 (>= 6.6), cpphs, libhugs-filepath, libhugs-hslogger
-Build-Conflicts: libhugs-filepath
 Standards-Version: 3.6.2
 Section: devel
 

-- 
haskell-testpack