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

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository beignet.

commit ec3128e0958b7d3b35c86bd56a517cae1e13e9e2
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Nov 18 14:16:50 2014 +0100

    Revert "Declare Conflicts: mesa-opencl-icd (workaround for #768185)"
    
    This reverts commit da053110ab2dd28d0945d0d27f8adcac3acdef37.
---
 debian/changelog | 1 -
 debian/control   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 76eee95..7f976e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,6 @@ 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 81119dc..a5de6e6 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, mesa-opencl-icd
+Conflicts: beignet0.0.1
 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