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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-09-03 16:07:54 +0000 (Sat, 03 Sep 2011)
New Revision: 773

Added:
   fglrx-driver/trunk/debian/fglrx-driver.links.in
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
work around non-multiarch dri module search path in fglrx-libglx.so

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-09-02 04:14:02 UTC (rev 772)
+++ fglrx-driver/trunk/debian/changelog	2011-09-03 16:07:54 UTC (rev 773)
@@ -13,6 +13,8 @@
     - Add Build-Depends: rpl and edit fglrx-libGL.so.1.2 with rpl to contain a
       sane search path of ${ORIGIN}/dri for the dri module, s.t. it is still
       found after moving it to the multiarch directory.
+    - Add a symlink from /usr/lib/*/dri/fglrx_dri.so to /usr/lib/dri/ s.t.
+      fglrx-libglx.so can still find the fglrx_dri.so module.
   * Move shared libraries from fglrx-driver package to new package libfglrx.
     Further splitting does not look promising as there are several libraries
     without proper SONAME and libraries from different upstream releases may

Added: fglrx-driver/trunk/debian/fglrx-driver.links.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.links.in	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-driver.links.in	2011-09-03 16:07:54 UTC (rev 773)
@@ -0,0 +1 @@
+_LIBDIR_/dri/fglrx_dri.so usr/lib/dri/fglrx_dri.so

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-09-02 04:14:02 UTC (rev 772)
+++ fglrx-driver/trunk/debian/rules	2011-09-03 16:07:54 UTC (rev 773)
@@ -95,6 +95,7 @@
 	sed -i -e '/^MULTIARCH/ s/^/#/' debian/rules
 	sed -i -e 's/debhelper (>= .*)/debhelper (>= 8.1.0~)/' \
 	       -e '/^Multi-Arch:/ d' debian/control
+	sed -i -e '/fglrx_dri.so/ s/^/#/' debian/fglrx-driver.links.in
 	debchange --bpo "Disable multiarch build."
 	debchange "Reduce Build-Depends: debhelper and compat level to 8."