[Pkg-haskell-commits] darcs: ghc: Also do not conflict with libghc-binary-doc

[Joachim Breitner]

Tue Jul 29 12:21:47 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Also do not conflict with libghc-binary-doc

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

Tue Jul 29 12:21:47 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Also do not conflict with libghc-binary-doc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2014-07-29 12:57:04.449361919 +0000
+++ new-ghc/changelog	2014-07-29 12:57:04.473361956 +0000
@@ -1,3 +1,9 @@
+ghc (7.6.3-16) UNRELEASED; urgency=medium
+
+  * Also do not conflict with libghc-binary-doc
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 29 Jul 2014 14:21:37 +0200
+
 ghc (7.6.3-15) unstable; urgency=medium
 
   * Do not conflict with libghc-binary-dev.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2014-07-29 12:57:04.449361919 +0000
+++ new-ghc/control	2014-07-29 12:57:04.453361925 +0000
@@ -72,8 +72,8 @@
 Architecture: all
 Suggests: haskell-doc
 Provides: ${provided-docs}
-Replaces: ghc6-doc (<< 7), libghc-binary-doc
-Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1), libghc-binary-doc
+Replaces: ghc6-doc (<< 7)
+Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1)
 Depends: ${haddock:Depends}, ${misc:Depends}, perl
 Description: Documentation for the Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for