[Pkg-fglrx-devel] r760 - fglrx-driver/trunk/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Wed Aug 31 22:44:37 UTC 2011
Author: anbe-guest
Date: 2011-08-31 22:44:37 +0000 (Wed, 31 Aug 2011)
New Revision: 760
Added:
fglrx-driver/trunk/debian/libfglrx-ia32.install
fglrx-driver/trunk/debian/libfglrx-ia32.links
fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/fglrx-glx-ia32.install
fglrx-driver/trunk/debian/fglrx-glx-ia32.links
fglrx-driver/trunk/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/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2011-08-31 22:31:47 UTC (rev 759)
+++ fglrx-driver/trunk/debian/changelog 2011-08-31 22:44:37 UTC (rev 760)
@@ -11,6 +11,12 @@
- Add Multi-Arch: same.
- Bump debhelper dependency to 8.1.3 and 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.
+ * Install the same libraries in libfglrx-ia32 as in libfglrx. E.g. 32-bit
+ OpenCL applications need libatical*.so.
+ * Prevent concurrent installation of multiarch packages (lib*:i386) and
+ their corresponding biarch packages (lib*-ia32:amd64).
* Override the experimental lintian tag shlib-calls-exit.
* Prepare support for squeeze-backports:
- Add instructions for squeeze-backports to README.source and a
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2011-08-31 22:31:47 UTC (rev 759)
+++ fglrx-driver/trunk/debian/control 2011-08-31 22:44:37 UTC (rev 760)
@@ -74,6 +74,8 @@
Depends:
${shlibs:Depends},
${misc:Depends},
+Conflicts:
+ libfglrx-ia32 [i386],
Breaks:
fglrx-driver (<< 1:11-8-2),
Replaces:
@@ -92,6 +94,8 @@
${misc:Depends},
${shlibs:Depends},
glx-alternative-fglrx (>= 0.1.92)
+Conflicts:
+ fglrx-glx-ia32 [i386],
Breaks:
nvidia-glx (<< 275.09.07-3),
libgl1-nvidia-glx (<< 275.09.07-3)
@@ -108,6 +112,7 @@
Depends:
${misc:Depends},
${shlibs:Depends},
+ libfglrx-ia32 (= ${binary:Version}),
fglrx-driver (= ${binary:Version})
Pre-Depends: libc6-i386 (>= 2.9-18)
Conflicts:
@@ -122,6 +127,26 @@
This driver is not free. As an alternative, you may try the newest free
driver xserver-xorg-video-radeon.
+Package: libfglrx-ia32
+Section: non-free/libs
+Architecture: amd64
+Pre-Depends:
+ libc6-i386 (>= 2.9-18),
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks:
+ fglrx-glx-ia32 (<< 1:11-8-2),
+Replaces:
+ fglrx-glx-ia32 (<< 1:11-8-2),
+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/trunk/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-08-31 22:31:47 UTC (rev 759)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2011-08-31 22:44:37 UTC (rev 760)
@@ -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/trunk/debian/fglrx-glx-ia32.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.links 2011-08-31 22:31:47 UTC (rev 759)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.links 2011-08-31 22:44:37 UTC (rev 760)
@@ -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/trunk/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides 2011-08-31 22:31:47 UTC (rev 759)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides 2011-08-31 22:44:37 UTC (rev 760)
@@ -1,11 +1,6 @@
no-upstream-changelog
-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
diversion-for-unknown-file usr/lib32/libGL.so.1.2 preinst:.*
shlib-calls-exit usr/lib32/fglrx-libGL.so.1.2
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/trunk/debian/libfglrx-ia32.install (from rev 757, fglrx-driver/branches/multiarch/debian/libfglrx-ia32.install)
===================================================================
--- fglrx-driver/trunk/debian/libfglrx-ia32.install (rev 0)
+++ fglrx-driver/trunk/debian/libfglrx-ia32.install 2011-08-31 22:44:37 UTC (rev 760)
@@ -0,0 +1,9 @@
+arch/x86/usr/lib/libatiuki.so.1.0 usr/lib32/
+arch/x86/usr/lib/libaticaldd.so usr/lib32/
+arch/x86/usr/lib/libaticalcl.so usr/lib32/
+arch/x86/usr/lib/libaticalrt.so usr/lib32/
+arch/x86/usr/X11R6/lib/libatiadlxx.so usr/lib32/
+arch/x86/usr/X11R6/lib/libXvBAW.so.1.0 usr/lib32/
+arch/x86/usr/X11R6/lib/libAMDXvBA.so.1.0 usr/lib32/
+arch/x86/usr/X11R6/lib/libfglrx_dm.so.1.0 usr/lib32/
+arch/x86/usr/X11R6/lib/modules/dri/fglrx_dri.so usr/lib32/dri/
Copied: fglrx-driver/trunk/debian/libfglrx-ia32.links (from rev 757, fglrx-driver/branches/multiarch/debian/libfglrx-ia32.links)
===================================================================
--- fglrx-driver/trunk/debian/libfglrx-ia32.links (rev 0)
+++ fglrx-driver/trunk/debian/libfglrx-ia32.links 2011-08-31 22:44:37 UTC (rev 760)
@@ -0,0 +1,3 @@
+usr/lib32/libAMDXvBA.so.1.0 usr/lib32/libAMDXvBA.so.1
+usr/lib32/libXvBAW.so.1.0 usr/lib32/libXvBAW.so.1
+usr/lib32/libatiuki.so.1.0 usr/lib32/libatiuki.so.1
Copied: fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides (from rev 757, fglrx-driver/branches/multiarch/debian/libfglrx-ia32.lintian-overrides)
===================================================================
--- fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides (rev 0)
+++ fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides 2011-08-31 22:44:37 UTC (rev 760)
@@ -0,0 +1,14 @@
+no-upstream-changelog
+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
+spelling-error-in-binary usr/lib32/libaticalcl.so nam name
+spelling-error-in-binary usr/lib32/libaticalrt.so nam name
+sharedobject-in-library-directory-missing-soname usr/lib32/libatiadlxx.so
+sharedobject-in-library-directory-missing-soname usr/lib32/libaticalcl.so
+sharedobject-in-library-directory-missing-soname usr/lib32/libaticaldd.so
+sharedobject-in-library-directory-missing-soname usr/lib32/libaticalrt.so
+no-symbols-control-file usr/lib32/libXvBAW.so.1.0
+no-symbols-control-file usr/lib32/libatiuki.so.1.0
+no-symbols-control-file usr/lib32/libAMDXvBA.so.1.0
+no-symbols-control-file usr/lib32/libfglrx_dm.so.1.0
More information about the Pkg-fglrx-devel
mailing list