[Pkg-haskell-commits] darcs: ghc: Actually use the conflicting-devs variable in debian/control. No idea what went wrong yesterday.

[Joachim Breitner]

Wed Jun 11 07:55:28 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Actually use the conflicting-devs variable in debian/control. No idea what went wrong yesterday.

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

Wed Jun 11 07:55:28 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Actually use the conflicting-devs variable in debian/control. No idea what went wrong yesterday.
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2014-06-11 08:42:30.278520358 +0000
+++ new-ghc/changelog	2014-06-11 08:42:30.302520376 +0000
@@ -1,3 +1,10 @@
+ghc (7.6.3-13) UNRELEASED; urgency=medium
+
+  * Actually use the conflicting-devs variable in debian/control. No idea what
+    went wrong yesterday.
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 11 Jun 2014 09:54:53 +0200
+
 ghc (7.6.3-12) unstable; urgency=medium
 
   * Last update broke the calculation of the Provides fields, fixing.
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2014-06-11 08:42:30.278520358 +0000
+++ new-ghc/control	2014-06-11 08:42:30.282520362 +0000
@@ -36,7 +36,7 @@
 Depends: llvm [armel armhf], gcc, libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
 Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}
 Replaces: ghc6 (<< 7)
-Conflicts: ghc6 (<< 7), ${provided-devs}
+Conflicts: ghc6 (<< 7), ${conflicting-devs}
 Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.8.13), ghc-doc (<= 6.12.1-8)
 Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm
 Description: The Glasgow Haskell Compilation system