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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-12-02 09:30:19 +0000 (Fri, 02 Dec 2011)
New Revision: 831

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
add Conflicts: amd-app (unknown package source)

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-11-25 18:14:41 UTC (rev 830)
+++ fglrx-driver/trunk/debian/changelog	2011-12-02 09:30:19 UTC (rev 831)
@@ -1,3 +1,10 @@
+fglrx-driver (1:11-11-4) UNRELEASED; urgency=low
+
+  [ Andreas Beckmann ]
+  * Add Conflicts: amd-app.  (Package from unknown source.)  (Closes: #650660)
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Fri, 02 Dec 2011 10:26:41 +0100
+
 fglrx-driver (1:11-11-3) unstable; urgency=low
 
   [ Andreas Beckmann ]

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-11-25 18:14:41 UTC (rev 830)
+++ fglrx-driver/trunk/debian/control	2011-12-02 09:30:19 UTC (rev 831)
@@ -334,6 +334,8 @@
  libopencl1,
 Provides:
  opencl-icd,
+Conflicts:
+ amd-app,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
 Description: AMD OpenCL ICD
  OpenCL (Open Computing Language) is a multivendor open standard for
@@ -357,6 +359,7 @@
 Conflicts:
  nvidia-libopencl1,
  nvidia-libopencl1-ia32 [i386],
+ amd-app,
 Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
 Description: AMD OpenCL library
  OpenCL (Open Computing Language) is a multivendor open standard for