[Pkg-haskell-commits] darcs: darcs: Remove conflict on hlint.

[Trent W. Buck]

Mon May 10 08:01:19 UTC 2010  Trent W. Buck <trentbuck at gmail.com>
  * Remove conflict on hlint.
  Ignore-this: 9adf51c41db3dfe1dc10048890d44d0b

    M ./changelog +1
    M ./control -2

Mon May 10 08:01:19 UTC 2010  Trent W. Buck <trentbuck at gmail.com>
  * Remove conflict on hlint.
  Ignore-this: 9adf51c41db3dfe1dc10048890d44d0b
diff -rN -u -purd old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog	2010-05-11 03:49:40.882758269 +0000
+++ new-darcs/changelog	2010-05-11 03:49:40.894758896 +0000
@@ -3,6 +3,7 @@ darcs (2.4.3-1) UNRELEASED; urgency=low
   * New upstream release
   * Rebase build dependencies.
   * Rebase patches.
+  * Remove conflict on hlint.
 
  -- Trent W. Buck <trentbuck at gmail.com>  Mon, 10 May 2010 16:45:43 +1000
 
diff -rN -u -purd old-darcs/control new-darcs/control
--- old-darcs/control	2010-05-11 03:49:40.882758269 +0000
+++ new-darcs/control	2010-05-11 03:49:40.890758687 +0000
@@ -21,8 +21,6 @@ Build-Depends: debhelper (>= 7.0.50), gh
  libghc6-regex-compat-dev,
  libghc6-terminfo-dev,
  libghc6-zlib-dev
-# Work around http://bugs.debian.org/579270, remove for 2.4.2.
-Build-Conflicts: hlint
 Homepage: http://darcs.net/
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/darcs
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/darcs