[Pkg-haskell-commits] darcs: ghc: ghc-doc: Conflict on libghc-haddock-doc, as it contains files that moved into ghc-doc.

[Joachim Breitner]

Mon Mar 12 16:48:04 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * ghc-doc: Conflict on libghc-haddock-doc, as it contains files that moved into ghc-doc.
  Ignore-this: 652b990ffecd4672499decdd378af2ed

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

Mon Mar 12 16:48:04 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * ghc-doc: Conflict on libghc-haddock-doc, as it contains files that moved into ghc-doc.
  Ignore-this: 652b990ffecd4672499decdd378af2ed
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-03-12 16:51:35.286932658 +0000
+++ new-ghc//changelog	2012-03-12 16:51:35.291248813 +0000
@@ -2,6 +2,8 @@
 
   * Remove the ghc-doc symlink logic from 7.0.4-3, as with 7.4.1, every
     documentation package had to be rebuit.
+  * ghc-doc: Conflict on libghc-haddock-doc, as it contains files that moved
+    into ghc-doc.
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 12 Mar 2012 15:23:53 +0100
 
diff -rN -u old-ghc//control new-ghc//control
--- old-ghc//control	2012-03-12 16:51:35.247273390 +0000
+++ new-ghc//control	2012-03-12 16:51:35.291248813 +0000
@@ -70,8 +70,8 @@
 Architecture: all
 Suggests: haskell-doc
 Provides: ${provided-docs}
-Replaces: ghc6-doc (<< 7)
-Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1)
+Replaces: ghc6-doc (<< 7), libghc-binary-doc
+Conflicts: ghc6-doc (<< 7), ghc (<= 7.0.3-1), libghc-binary-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