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

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-07-26 18:32:25 +0000 (Mon, 26 Jul 2010)
New Revision: 438

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
- Move some conflicts to breaks.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-07-26 18:30:47 UTC (rev 437)
+++ fglrx-driver/trunk/debian/changelog	2010-07-26 18:32:25 UTC (rev 438)
@@ -17,7 +17,8 @@
       Closes: #587708
   * Remove Bertrand Marc from uploaders. Thanks for your previous work!
   * Reference to the radeon driver, instead of the deprecated radeonhd one.
-  * Bump Standards-Version to 3.9.1 (no changes needed).
+  * Bump Standards-Version to 3.9.1.
+    - Move some conflicts to breaks.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 26 Jul 2010 20:11:38 +0200
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2010-07-26 18:30:47 UTC (rev 437)
+++ fglrx-driver/trunk/debian/control	2010-07-26 18:32:25 UTC (rev 438)
@@ -71,7 +71,7 @@
 Recommends: module-assistant | kernel-package
 Suggests: fglrx-driver
 Replaces: fglrx-kernel-src (<< 1:8-4-2)
-Conflicts: fglrx-kernel-src (<< 1:8-4-2)
+Breaks: fglrx-kernel-src (<< 1:8-4-2)
 Description: kernel module source for the non-free AMD/ATI r6xx - r7xx display driver
  This package provides the kernel build environment and the fglrx modules,
  which are necessary to have accelerated 3D support within the AMD/ATI
@@ -108,7 +108,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}, xserver-xorg (>= 1:7.4+1), lsb-base
 Recommends: fglrx-driver (= ${binary:Version}), acpid
 Replaces: fglrx-driver (<< 1:8-4-2)
-Conflicts: fglrx-driver (<< 1:8-4-2)
+Breaks: fglrx-driver (<< 1:8-4-2)
 Description: external events daemon for the non-free AMD/ATI r6xx - r7xx display driver
  Display driver for the ATI recent Radeon and FireGL graphics cards.
  .