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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-06-30 18:09:34 +0000 (Sat, 30 Jun 2012)
New Revision: 934

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

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-06-30 18:03:22 UTC (rev 933)
+++ fglrx-driver/trunk/debian/changelog	2012-06-30 18:09:34 UTC (rev 934)
@@ -1,3 +1,10 @@
+fglrx-driver (1:12-6-2) UNRELEASED; urgency=low
+
+  * amd-libopencl1: Provides/Conflicts/Replaces: libopencl1.
+    (Closes: #679038)
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Sat, 30 Jun 2012 20:03:53 +0200
+
 fglrx-driver (1:12-6-1) unstable; urgency=low
 
   [ Michael Gilbert ]

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2012-06-30 18:03:22 UTC (rev 933)
+++ fglrx-driver/trunk/debian/control	2012-06-30 18:09:34 UTC (rev 934)
@@ -365,9 +365,12 @@
 Provides:
  libopencl1,
 Conflicts:
+ libopencl1,
  nvidia-libopencl1,
  nvidia-libopencl1-ia32 [i386],
  amd-app,
+Replaces:
+ libopencl1,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
 Description: AMD OpenCL library
  OpenCL (Open Computing Language) is a multivendor open standard for
@@ -380,12 +383,14 @@
 Package: amd-opencl-dev
 Architecture: i386 amd64
 Multi-Arch: same
-Provides:
- opencl-dev
 Depends:
  amd-libopencl1 | libopencl1,
  opencl-headers (>= 1.2),
  ${misc:Depends}
+Recommends:
+ libgl1-mesa-dev | libgl-dev,
+Provides:
+ 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