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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-09 11:07:12 +0000 (Tue, 09 Aug 2011)
New Revision: 704

Added:
   fglrx-driver/branches/multiarch/debian/libfglrx-ia32.install
   fglrx-driver/branches/multiarch/debian/libfglrx-ia32.links
   fglrx-driver/branches/multiarch/debian/libfglrx-ia32.lintian-overrides
Modified:
   fglrx-driver/branches/multiarch/debian/changelog
   fglrx-driver/branches/multiarch/debian/control
   fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.install
   fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.links
   fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.lintian-overrides
Log:
Move shared libraries (except for libGL.so.1) from fglrx-glx-ia32 package to new package libfglrx-ia32.

Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog	2011-08-09 10:42:35 UTC (rev 703)
+++ fglrx-driver/branches/multiarch/debian/changelog	2011-08-09 11:07:12 UTC (rev 704)
@@ -9,6 +9,8 @@
     - Add Multi-Arch: same.
     - Bump debhelper compat level to 9.
   * Move shared libraries from fglrx-driver package to new package libfglrx.
+  * Move shared libraries (except for libGL.so.1) from fglrx-glx-ia32 package
+    to new package libfglrx-ia32.
   * 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 10:42:35 UTC (rev 703)
+++ fglrx-driver/branches/multiarch/debian/control	2011-08-09 11:07:12 UTC (rev 704)
@@ -108,6 +108,7 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
+ libfglrx-ia32 (= ${binary:Version}),
  fglrx-driver (= ${binary:Version})
 Pre-Depends: libc6-i386 (>= 2.9-18)
 Conflicts:
@@ -122,6 +123,25 @@
  This driver is not free. As an alternative, you may try the newest free
  driver xserver-xorg-video-radeon.
 
+Package: libfglrx-ia32
+Architecture: amd64
+Pre-Depends:
+ libc6-i386 (>= 2.9-18),
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks:
+ fglrx-glx-ia32 (<< ${fglrx:multiarch}),
+Replaces:
+ fglrx-glx-ia32 (<< ${fglrx:multiarch}),
+Description: non-free ATI/AMD RadeonHD display driver (32-bit runtime libraries)
+ Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
+ .
+ This package contains the 32-bit runtime libraries.
+ .
+ This driver is not free. As an alternative, you may try the newest free
+ driver xserver-xorg-video-radeon.
+
 Package: fglrx-modules-dkms
 Section: non-free/kernel
 Architecture: i386 amd64

Modified: fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.install	2011-08-09 10:42:35 UTC (rev 703)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.install	2011-08-09 11:07:12 UTC (rev 704)
@@ -1,4 +1 @@
-arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri
-arch/x86/usr/lib/libatiuki* usr/lib32
 arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 usr/lib32
-arch/x86/usr/X11R6/lib/libatiadlxx.so* usr/lib32

Modified: fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.links
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.links	2011-08-09 10:42:35 UTC (rev 703)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.links	2011-08-09 11:07:12 UTC (rev 704)
@@ -1,2 +1 @@
-/usr/lib32/libatiuki.so.1.0 /usr/lib32/libatiuki.so.1
 /usr/lib32/fglrx-libGL.so.1.2 /usr/lib32/libGL.so.1

Modified: fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.lintian-overrides	2011-08-09 10:42:35 UTC (rev 703)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.lintian-overrides	2011-08-09 11:07:12 UTC (rev 704)
@@ -1,10 +1,5 @@
-spelling-error-in-binary usr/lib32/dri/fglrx_dri.so nam name
-spelling-error-in-binary usr/lib32/dri/fglrx_dri.so ouput output
-spelling-error-in-binary usr/lib32/dri/fglrx_dri.so UNKOWN UNKNOWN
 no-upstream-changelog
 diversion-for-unknown-file usr/lib32/libGL.so.1.2 preinst:.*
 shlib-with-non-pic-code usr/lib32/fglrx-libGL.so.1.2
-no-symbols-control-file usr/lib32/libatiuki.so.1.0
 no-symbols-control-file usr/lib32/fglrx-libGL.so.1.2
 shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
-sharedobject-in-library-directory-missing-soname usr/lib32/libatiadlxx.so

Copied: fglrx-driver/branches/multiarch/debian/libfglrx-ia32.install (from rev 703, fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.install)
===================================================================
--- fglrx-driver/branches/multiarch/debian/libfglrx-ia32.install	                        (rev 0)
+++ fglrx-driver/branches/multiarch/debian/libfglrx-ia32.install	2011-08-09 11:07:12 UTC (rev 704)
@@ -0,0 +1,3 @@
+arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri
+arch/x86/usr/lib/libatiuki* usr/lib32
+arch/x86/usr/X11R6/lib/libatiadlxx.so* usr/lib32

Copied: fglrx-driver/branches/multiarch/debian/libfglrx-ia32.links (from rev 703, fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.links)
===================================================================
--- fglrx-driver/branches/multiarch/debian/libfglrx-ia32.links	                        (rev 0)
+++ fglrx-driver/branches/multiarch/debian/libfglrx-ia32.links	2011-08-09 11:07:12 UTC (rev 704)
@@ -0,0 +1 @@
+/usr/lib32/libatiuki.so.1.0 /usr/lib32/libatiuki.so.1

Copied: fglrx-driver/branches/multiarch/debian/libfglrx-ia32.lintian-overrides (from rev 703, fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.lintian-overrides)
===================================================================
--- fglrx-driver/branches/multiarch/debian/libfglrx-ia32.lintian-overrides	                        (rev 0)
+++ fglrx-driver/branches/multiarch/debian/libfglrx-ia32.lintian-overrides	2011-08-09 11:07:12 UTC (rev 704)
@@ -0,0 +1,6 @@
+spelling-error-in-binary usr/lib32/dri/fglrx_dri.so nam name
+spelling-error-in-binary usr/lib32/dri/fglrx_dri.so ouput output
+spelling-error-in-binary usr/lib32/dri/fglrx_dri.so UNKOWN UNKNOWN
+no-upstream-changelog
+no-symbols-control-file usr/lib32/libatiuki.so.1.0
+sharedobject-in-library-directory-missing-soname usr/lib32/libatiadlxx.so