[Pkg-haskell-commits] [SCM] Haskell binding to libmagic branch, master, updated. debian/1.0.8-2-13-g641e285

[Marco Túlio Gontijo e Silva]

The following commit has been merged in the master branch:
commit 89bdf7251da853487a026a7616d2aa617e0cd5f6
Author: Marco Túlio Gontijo e Silva <marcot at riseup.net>
Date:   Sun Aug 8 00:46:29 2010 -0300

    debian/control: Make libghc6-magic-doc conflict with magic-haskell- doc (<< 1.0.8-4).

diff --git a/debian/changelog b/debian/changelog
index 36b3a06..d238511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 magic-haskell (1.0.8-6) UNRELEASED; urgency=low
 
   * Reincorporate 1.0.8-4.
+  * debian/control: Make libghc6-magic-doc conflict with magic-haskell-
+    doc (<< 1.0.8-4).
 
  -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Sat, 07 Aug 2010 17:28:33 -0300
 
diff --git a/debian/control b/debian/control
index 8a660fb..ee724c0 100644
--- a/debian/control
+++ b/debian/control
@@ -68,8 +68,8 @@ Depends: ${misc:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: magic-haskell-doc
-Replaces: magic-haskell-doc
-Conflicts: magic-haskell-doc
+Replaces: magic-haskell-doc (<< 1.0.8-4)
+Conflicts: magic-haskell-doc (<< 1.0.8-4)
 Description: File type determination library for Haskell; documentation
  This package provides the documentation for a library for the Haskell
  programming language.

-- 
Haskell binding to libmagic