[Pkg-haskell-commits] darcs: ghc: Do not conflict with libghc-binary-dev.

[Joachim Breitner]

Sat Jul 26 13:32:05 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Do not conflict with libghc-binary-dev.

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

Sat Jul 26 13:32:05 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Do not conflict with libghc-binary-dev.
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2014-07-26 14:20:31.975343203 +0000
+++ new-ghc/changelog	2014-07-26 14:20:31.999343204 +0000
@@ -1,3 +1,9 @@
+ghc (7.6.3-15) UNRELEASED; urgency=medium
+
+  * Do not conflict with libghc-binary-dev.
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 26 Jul 2014 15:31:53 +0200
+
 ghc (7.6.3-14) unstable; urgency=medium
 
   * Backport from 7.8: Do not panic when annotations are encountered on non-TH
diff -rN -u old-ghc/provided_substvars new-ghc/provided_substvars
--- old-ghc/provided_substvars	2014-07-26 14:20:31.975343203 +0000
+++ new-ghc/provided_substvars	2014-07-26 14:20:31.995343205 +0000
@@ -9,7 +9,7 @@
 my %ignored;
 $ignored{$_}++ for @ignored;
 
-my @no_conflict = ('cabal');
+my @no_conflict = ('cabal', 'binary');
 my %no_conflict;
 $no_conflict{$_}++ for @no_conflict;