[Pkg-haskell-commits] darcs: ghc: Conflict with libghc-xhtml-doc

[Joachim Breitner]

Tue Feb 17 23:51:54 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Conflict with libghc-xhtml-doc 

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

Tue Feb 17 23:51:54 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Conflict with libghc-xhtml-doc 
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-02-17 23:52:01.997337793 +0000
+++ new-ghc/changelog	2015-02-17 23:52:02.001337794 +0000
@@ -1,3 +1,9 @@
+ghc (7.8.20141223-2) UNRELEASED; urgency=medium
+
+  * ghc-doc: Conflict with libghc-xhtml-doc 
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 18 Feb 2015 00:51:28 +0100
+
 ghc (7.8.20141223-1) experimental; urgency=medium
 
   * New upstream release (7.8.4)
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2015-02-17 23:52:01.993337792 +0000
+++ new-ghc/control	2015-02-17 23:52:02.001337794 +0000
@@ -73,7 +73,7 @@
 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
+Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1), libghc-binary-doc, libghc-xhtml-doc
 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