[Pkg-fglrx-devel] r1221 - fglrx-legacy-driver/trunk/debian

[Andreas Beckmann]

Author: anbe
Date: 2013-05-05 19:30:44 +0000 (Sun, 05 May 2013)
New Revision: 1221

Modified:
   fglrx-legacy-driver/trunk/debian/control
Log:
fix minor mismerge

Modified: fglrx-legacy-driver/trunk/debian/control
===================================================================
--- fglrx-legacy-driver/trunk/debian/control	2013-05-05 19:27:16 UTC (rev 1220)
+++ fglrx-legacy-driver/trunk/debian/control	2013-05-05 19:30:44 UTC (rev 1221)
@@ -286,7 +286,7 @@
  fglrx-atieventsd-virtual,
 Replaces:
  fglrx-atieventsd-virtual,
-Description: legacy events daemon for the non-free AMD RadeonHD display driver
+Description: events daemon for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
  .
@@ -341,7 +341,7 @@
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends:
- amd-opencl-icd,
+ opencl-icd | amd-opencl-icd,
 Provides:
  libopencl1,
 Conflicts:
@@ -384,7 +384,7 @@
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends:
- amd-opencl-icd,
+ opencl-icd | amd-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