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

[Andreas Beckmann]

Author: anbe
Date: 2014-01-30 01:14:30 +0000 (Thu, 30 Jan 2014)
New Revision: 1333

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
restore libgl1-fglrx-glx-i386

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-01-30 00:44:27 UTC (rev 1332)
+++ fglrx-driver/trunk/debian/changelog	2014-01-30 01:14:30 UTC (rev 1333)
@@ -1,6 +1,7 @@
 fglrx-driver (1:13.12-4) UNRELEASED; urgency=medium
 
   * Collect more package information when reporting bugs.
+  * Restore libgl1-fglrx-glx-i386 package.
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 30 Jan 2014 01:36:00 +0100
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2014-01-30 00:44:27 UTC (rev 1332)
+++ fglrx-driver/trunk/debian/control	2014-01-30 01:14:30 UTC (rev 1333)
@@ -36,12 +36,13 @@
  lib${fglrx} (= ${binary:Version}),
  ${fglrx:XorgDepends},
  xserver-xorg-core,
- libgl1-${fglrx}-glx (= ${binary:Version}),
  glx-alternative-fglrx (>= 0.4.1~),
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends:
  ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
+ libgl1-${fglrx}-glx (= ${binary:Version}),
+ libgl1-${fglrx}-glx-i386 [amd64],
  ${fglrx}-atieventsd,
 Suggests:
  ${fglrx}-control,
@@ -52,6 +53,9 @@
  xserver-xorg-video-fglrx,
 Conflicts:
  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}
@@ -178,6 +182,19 @@
  .
  This package provides the proprietary libGL shipped by ATI/AMD.
 
+#Package: libgl1-${fglrx}-glx-i386
+Package: libgl1-fglrx-glx-i386
+Architecture: i386
+Multi-Arch: foreign
+Depends:
+ libgl1-${fglrx}-glx,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: ATI/AMD binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
+ This metapackage helps the automatic installation of the 32-bit ATI/AMD
+ OpenGL libraries when installing libgl1-${fglrx}-glx
+ on amd64 with foreign architecture i386 enabled.
+
 # ${fglrx}-modules-dkms
 Package: fglrx-modules-dkms
 Section: non-free/kernel