[beignet] 05/06: Declare Conflicts: mesa-opencl-icd (workaround for #768185)

[Rebecca Palmer]

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit da053110ab2dd28d0945d0d27f8adcac3acdef37
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Mon Nov 17 19:03:34 2014 +0000

    Declare Conflicts: mesa-opencl-icd (workaround for #768185)
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7f976e6..76eee95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ beignet (1.0.0-1) UNRELEASED; urgency=medium
     None build type)
   * Enable extra debug output in tests
   * Document in the description what hardware this supports.
+  * Declare Conflicts: mesa-opencl-icd (workaround for #768185)
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 17 Nov 2014 07:09:58 +0100
 
diff --git a/debian/control b/debian/control
index a5de6e6..81119dc 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Description: Intel OpenCL library (development files)
 Package: beignet
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: beignet0.0.1
+Conflicts: beignet0.0.1, mesa-opencl-icd
 Replaces: beignet0.0.1
 Provides: opencl-icd
 Description: OpenCL library for Intel GPUs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git