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

[Andreas Beckmann]

Author: anbe
Date: 2014-04-23 14:39:44 +0000 (Wed, 23 Apr 2014)
New Revision: 1363

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
add workaround for apt/wheezy on multiarch upgrades

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-04-23 14:30:01 UTC (rev 1362)
+++ fglrx-driver/trunk/debian/changelog	2014-04-23 14:39:44 UTC (rev 1363)
@@ -2,6 +2,11 @@
 
   * libfglrx.preinst: Unify case before comparing PCI IDs, thanks to
     Jo Shields.  (Closes: #742452)
+  * Fix upgrades from multiarch-enabled wheezy to jessie by converting
+    fglrx-driver Breaks: libgl1-fglrx-glx (>> this) into
+    libgl1-fglrx-glx Breaks: fglrx-driver (<< this) which apt (from wheezy)
+    seems to cope much better with, thanks to Simon McVittie
+    (Closes: #745622).
 
  -- Andreas Beckmann <anbe at debian.org>  Wed, 23 Apr 2014 16:27:05 +0200
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2014-04-23 14:30:01 UTC (rev 1362)
+++ fglrx-driver/trunk/debian/control	2014-04-23 14:39:44 UTC (rev 1363)
@@ -55,7 +55,6 @@
  xserver-xorg-video-fglrx,
 Breaks:
  libgl1-${fglrx}-glx (<< ${binary:Version}),
- libgl1-${fglrx}-glx (>> ${binary:Version}),
 Replaces:
  xserver-xorg-video-fglrx,
 Description: non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
@@ -170,6 +169,7 @@
  fglrx-glx,
  fglrx-glx-ia32,
 Breaks:
+ ${fglrx}-driver (<< ${binary:Version}),
  ia32-libs (<< 1:0),
 Replaces:
  libgl1-fglrx-glx-virtual,