[Pkg-fglrx-devel] r709 - fglrx-driver/branches/multiarch/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-09 13:30:04 +0000 (Tue, 09 Aug 2011)
New Revision: 709

Modified:
   fglrx-driver/branches/multiarch/debian/changelog
   fglrx-driver/branches/multiarch/debian/control
Log:
prevent mixed installation of biarch and multiarch packages

Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog	2011-08-09 13:04:31 UTC (rev 708)
+++ fglrx-driver/branches/multiarch/debian/changelog	2011-08-09 13:30:04 UTC (rev 709)
@@ -17,6 +17,8 @@
     libxvbaw-dev.
   * Rename package fglrx-glx to libgl1-fglrx-glx. Keep old name as
     transitional package.
+  * Prevent concurrent installation of multiarch packages (lib*:i386) and
+    their corresponding biarch packages (lib*-ia32:amd64).
   * Add instructions for squeeze-backports to README.source and a
     prepare-squeeze-backport target to debian/rules that performs the
     necessary changes.

Modified: fglrx-driver/branches/multiarch/debian/control
===================================================================
--- fglrx-driver/branches/multiarch/debian/control	2011-08-09 13:04:31 UTC (rev 708)
+++ fglrx-driver/branches/multiarch/debian/control	2011-08-09 13:30:04 UTC (rev 709)
@@ -71,6 +71,8 @@
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Conflicts:
+ libgflrx-ia32 [i386],
 Breaks:
  fglrx-driver (<< ${fglrx:multiarch}),
 Replaces:
@@ -111,6 +113,8 @@
  ${misc:Depends},
  ${shlibs:Depends},
  glx-alternative-fglrx (>= 0.1.2)
+Conflicts:
+ fglrx-glx-ia32 [i386],
 Breaks:
  fglrx-glx (<< ${fglrx:multiarch}),
  nvidia-glx (<< 275.09.07-3),
@@ -156,6 +160,7 @@
  driver xserver-xorg-video-radeon.
 
 Package: libfglrx-ia32
+Section: non-free/libs
 Architecture: amd64
 Pre-Depends:
  libc6-i386 (>= 2.9-18),