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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-29 10:48:26 +0000 (Mon, 29 Aug 2011)
New Revision: 749

Modified:
   fglrx-driver/branches/multiarch/debian/changelog
   fglrx-driver/branches/multiarch/debian/libfglrx.install.in
Log:
merge changes from trunk up to r748, adjust libAMDXvBA.cap installation path for multilib

Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog	2011-08-27 21:45:03 UTC (rev 748)
+++ fglrx-driver/branches/multiarch/debian/changelog	2011-08-29 10:48:26 UTC (rev 749)
@@ -33,8 +33,13 @@
       /emul/ia32-linux/usr/lib => /usr/lib32 transition.
     - Cleanup /etc/init.d/fglrx-driver.
 
- -- Andreas Beckmann <debian at abeckmann.de>  Thu, 18 Aug 2011 09:46:11 +0200
+  [ Patrick Matthäi ]
+  * Install again the missing libAMDXvBA.cap file. Without it, XvBA will not
+    work.
+    Closes: #639402
 
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sat, 27 Aug 2011 23:41:50 +0200
+
 fglrx-driver (1:11-8-1) unstable; urgency=low
 
   [ Michael Gilbert ]

Modified: fglrx-driver/branches/multiarch/debian/libfglrx.install.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/libfglrx.install.in	2011-08-27 21:45:03 UTC (rev 748)
+++ fglrx-driver/branches/multiarch/debian/libfglrx.install.in	2011-08-29 10:48:26 UTC (rev 749)
@@ -5,5 +5,6 @@
 arch/_ARCH_/usr/X11R6/_LIB_/libatiadlxx.so	_LIBDIR_/
 arch/_ARCH_/usr/X11R6/_LIB_/libXvBAW.so.1.0	_LIBDIR_/
 arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.so.1.0	_LIBDIR_/
+arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.cap	_LIBDIR_/
 arch/_ARCH_/usr/X11R6/_LIB_/libfglrx_dm.so.1.0	_LIBDIR_/
 arch/_ARCH_/usr/X11R6/_LIB_/modules/dri		_LIBDIR_/