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

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-05-16 09:17:38 +0000 (Sun, 16 May 2010)
New Revision: 407

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
* The fglrx-driver package conflicts against the nvidia-glx package.
  Closes: #581776


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-04-29 17:43:13 UTC (rev 406)
+++ fglrx-driver/trunk/debian/changelog	2010-05-16 09:17:38 UTC (rev 407)
@@ -1,3 +1,10 @@
+fglrx-driver (1:10-4-2) UNRELEASED; urgency=low
+
+  * The fglrx-driver package conflicts against the nvidia-glx package.
+    Closes: #581776
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 16 May 2010 11:16:10 +0200
+
 fglrx-driver (1:10-4-1) unstable; urgency=low
 
   * New upstream release.

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2010-04-29 17:43:13 UTC (rev 406)
+++ fglrx-driver/trunk/debian/control	2010-05-16 09:17:38 UTC (rev 407)
@@ -19,7 +19,7 @@
 Recommends: fglrx-modules-dkms (= ${binary:Version}) | fglrx-source (= ${binary:Version}),
  fglrx-glx, fglrx-glx-ia32 [amd64], fglrx-atieventsd
 Provides: xserver-xorg-video-6
-Conflicts: ia32-fglrx-driver
+Conflicts: ia32-fglrx-driver, nvidia-glx
 Suggests: fglrx-control
 Description: non-free AMD/ATI r6xx - r7xx display driver
  Display driver for the ATI recent Radeon and FireGL graphics cards.