[Pkg-haskell-commits] darcs: ghc: Remove the hack introduced in 7.2.0 for a clean upgrade from 7.0.3.

[Joachim Breitner]

Tue May 12 10:37:56 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Remove the hack introduced in 7.2.0 for a clean upgrade from 7.0.3.

    M ./changelog +1
    R ./ghc-doc.dirs
    M ./ghc-doc.triggers -4

Tue May 12 10:37:56 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Remove the hack introduced in 7.2.0 for a clean upgrade from 7.0.3.
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-05-12 13:25:48.748683005 +0000
+++ new-ghc/changelog	2015-05-12 13:25:48.768683005 +0000
@@ -4,6 +4,7 @@
     what now works out of the box.
   * Ship haddock with ghc, and leave (most) paths as they are. It is easier to
     not fight against the way upstream builds and installs stuff.
+  * Remove the hack introduced in 7.2.0 for a clean upgrade from 7.0.3.
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 11 May 2015 22:28:05 +0200
 
diff -rN -u old-ghc/ghc-doc.dirs new-ghc/ghc-doc.dirs
--- old-ghc/ghc-doc.dirs	2015-05-12 13:25:48.748683005 +0000
+++ new-ghc/ghc-doc.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-# This is part of the haddock file work-around. By installing these directories
-# also in ghc-doc, we ensure that they are removed eventually by dpkg.
-/usr/lib/ghc-7.0.2/haddock
-/usr/lib/ghc-7.0.3/haddock
diff -rN -u old-ghc/ghc-doc.triggers new-ghc/ghc-doc.triggers
--- old-ghc/ghc-doc.triggers	2015-05-12 13:25:48.748683005 +0000
+++ new-ghc/ghc-doc.triggers	2015-05-12 13:25:48.756683005 +0000
@@ -1,6 +1,2 @@
 interest-noawait /usr/lib/ghc-doc/haddock
-interest-noawait /usr/lib/ghc-7.0.2/haddock
-interest-noawait /usr/lib/ghc-7.0.3/haddock
 interest-noawait /var/lib/ghc/package.conf.d
-interest-noawait /var/lib/ghc-7.0.3/package.conf.d
-interest-noawait /var/lib/ghc-7.0.4/package.conf.d