[Pkg-fglrx-devel] r1281 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe
Date: 2013-10-17 16:42:14 +0000 (Thu, 17 Oct 2013)
New Revision: 1281

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
prefer amd-opencl-icd over the virtual opencl-icd

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-10-17 16:10:19 UTC (rev 1280)
+++ fglrx-driver/trunk/debian/changelog	2013-10-17 16:42:14 UTC (rev 1281)
@@ -3,9 +3,10 @@
   * 13.4-2013.05.29.diff: New patch containing the changes from upstream
     re-release 13.4 (2013-05-29) (12.104)
   * amd-opencl-dev: Provides/Conflicts/Replaces: opencl-dev.
+  * Prefer amd-opencl-icd over the virtual opencl-icd.  (Closes: #695884)
   * amd-libopencl1: Provide virtual packages libopencl-1.1-1 and
     libopencl-1.2-1 and update description. 
-  * amd-libopencl1.symbols: New. Distinguish the neccessary dependency on
+  * amd-libopencl1.symbols: New. Distinguish the necessary dependency on
     libopencl-{1.1,1.2}-1 via the versioned symbols being used.
   * Move the libOpenCL.so symlink from amd-libopencl1 to amd-opencl-dev and
     adjust Depends/Breaks/Replaces accordingly.

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2013-10-17 16:10:19 UTC (rev 1280)
+++ fglrx-driver/trunk/debian/control	2013-10-17 16:42:14 UTC (rev 1281)
@@ -336,7 +336,7 @@
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends:
- opencl-icd | amd-opencl-icd,
+ amd-opencl-icd | opencl-icd,
 Provides:
  libopencl1,
  libopencl-1.1-1,
@@ -345,7 +345,7 @@
  libopencl1,
  amd-app,
 Breaks:
- amd-opencl-dev (<< 1:13.4-4),
+ amd-opencl-dev (<< 1:13.4-4~),
 Replaces:
  libopencl1,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
@@ -376,7 +376,7 @@
  opencl-dev,
 Replaces:
  opencl-dev,
- amd-libopencl1 (<< 1:13.4-4),
+ amd-libopencl1 (<< 1:13.4-4~),
 Description: AMD OpenCL development files
  OpenCL (Open Computing Language) is a multi-vendor open standard for
  general-purpose parallel programming of heterogeneous systems that include
@@ -390,7 +390,7 @@
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends:
- opencl-icd | amd-opencl-icd,
+ amd-opencl-icd | opencl-icd,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
 Description: AMD OpenCL info utility
  OpenCL (Open Computing Language) is a multivendor open standard for