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

[Andreas Beckmann]

Author: anbe
Date: 2013-07-28 22:59:39 +0000 (Sun, 28 Jul 2013)
New Revision: 1253

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
Provides/Conflicts/Replaces: opencl-dev

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-07-28 22:49:36 UTC (rev 1252)
+++ fglrx-driver/trunk/debian/changelog	2013-07-28 22:59:39 UTC (rev 1253)
@@ -1,5 +1,6 @@
 fglrx-driver (1:13.4-4) UNRELEASED; urgency=low
 
+  * ocl-icd-opencl-dev: Provides/Conflicts/Replaces: opencl-dev.
   * amd-libopencl1: Provide virtual packages libopencl-1.1-1 and
     libopencl-1.2-1 and update description. 
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2013-07-28 22:49:36 UTC (rev 1252)
+++ fglrx-driver/trunk/debian/control	2013-07-28 22:59:39 UTC (rev 1253)
@@ -351,8 +351,6 @@
  libopencl-1.2-1,
 Conflicts:
  libopencl1,
- nvidia-libopencl1,
- nvidia-libopencl1-ia32,
  amd-app,
 Replaces:
  libopencl1,
@@ -379,7 +377,11 @@
 Recommends:
  libgl1-mesa-dev | libgl-dev,
 Provides:
- opencl-dev
+ opencl-dev,
+Conflicts:
+ opencl-dev,
+Replaces:
+ opencl-dev,
 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