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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-09-02 04:14:02 +0000 (Fri, 02 Sep 2011)
New Revision: 772

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/rules
Log:
Add Build-Depends: rpl and edit fglrx-libGL.so.1.2 with rpl to contain a sane search path of /dri for the dri module.

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-09-01 09:00:55 UTC (rev 771)
+++ fglrx-driver/trunk/debian/changelog	2011-09-02 04:14:02 UTC (rev 772)
@@ -10,6 +10,9 @@
     - Add Pre-Depends: ${misc:Pre-Depends}.
     - Add Multi-Arch: same.
     - Bump debhelper dependency to 8.1.3 and compat level to 9.
+    - 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.
   * 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

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-09-01 09:00:55 UTC (rev 771)
+++ fglrx-driver/trunk/debian/control	2011-09-02 04:14:02 UTC (rev 772)
@@ -21,6 +21,7 @@
  docbook-xsl,
  chrpath,
  automake,
+ rpl,
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-fglrx/fglrx-driver/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-fglrx/fglrx-driver/trunk/

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-09-01 09:00:55 UTC (rev 771)
+++ fglrx-driver/trunk/debian/rules	2011-09-02 04:14:02 UTC (rev 772)
@@ -65,6 +65,14 @@
 override_dh_install:
 	dh_install
 	chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
+	test ! -d debian/libgl1-fglrx-glx || \
+		rpl -e	'/usr/X11R6/lib/modules/dri\0' \
+			'$${ORIGIN}/dri\0!!!!!!!!!!!!\0' \
+			debian/libgl1-fglrx-glx/$(libdir)/fglrx/fglrx-libGL.so.1.2
+	test ! -d debian/fglrx-glx-ia32 || \
+		rpl -e	'/usr/X11R6/lib/modules/dri\0' \
+			'$${ORIGIN}/dri\0!!!!!!!!!!!!\0' \
+			debian/fglrx-glx-ia32/usr/lib32/fglrx-libGL.so.1.2
 
 # Install reportbug files in all binary packages
 override_dh_bugfiles: