[pkg-nvidia-devel] r1398 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog libgl1-nvidia-dev.links libgl1-nvidia-glx-ia32.install.in libgl1-nvidia-glx-ia32.links.in libgl1-nvidia-glx.install.in libgl1-nvidia-glx.links.in rules

anbe-guest at users.alioth.debian.org anbe-guest at users.alioth.debian.org
Tue Aug 10 12:20:10 UTC 2010


Author: anbe-guest
Date: Tue Aug 10 12:20:03 2010
New Revision: 1398

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1398
Log:
Install libGL.so* in /usr/lib{,32}/nvidia/

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.links
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.install.in
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.install.in
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.links.in
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1398&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Tue Aug 10 12:20:03 2010
@@ -8,6 +8,8 @@
     installed: add back a special shlibs entry for libGL.so.1 and remove
     libGL.so.1 from the symbols file to ensure to generate a dependency on
     libgl1-mesa-glx | libgl1 only.  (Closes: #587091)
+  * Install libGL.so* in /usr/lib{,32}/nvidia/ and use alternatives to handle
+    /usr/lib{,32}/libGL.so.1 and /usr/lib{,32}/libGL.so.
   * Split the nvidia-glx{,-ia32} packages, move the runtime libraries to
     libgl1-nvidia-glx{,-ia32}.  (Closes: #369316)
   * Rename package nvidia-glx-dev to libgl1-nvidia-dev (add dummy package).

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.links?rev=1398&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.links (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.links Tue Aug 10 12:20:03 2010
@@ -1,1 +1,1 @@
-usr/lib/libGL.so.1	usr/lib/nvidia/libGL.so
+usr/lib/nvidia/libGL.so.1	usr/lib/nvidia/libGL.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.install.in?rev=1398&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.install.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.install.in Tue Aug 10 12:20:03 2010
@@ -1,4 +1,4 @@
-usr/lib32/libGL.so.#VERSION#
+usr/lib32/libGL.so.#VERSION#			usr/lib32/nvidia/
 usr/lib32/libGLcore.so.#VERSION#
 usr/lib32/libnvidia-tls.so.#VERSION#
 usr/lib32/tls/libnvidia-tls.so.#VERSION#

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.links.in?rev=1398&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.links.in Tue Aug 10 12:20:03 2010
@@ -1,5 +1,5 @@
-usr/lib32/libGL.so.#VERSION#			usr/lib32/libGL.so.1
-usr/lib32/libGL.so.1				usr/lib32/nvidia/libGL.so
+usr/lib32/nvidia/libGL.so.#VERSION#		usr/lib32/nvidia/libGL.so.1
+usr/lib32/nvidia/libGL.so.1			usr/lib32/nvidia/libGL.so
 usr/lib32/libGLcore.so.#VERSION#		usr/lib32/libGLcore.so.1
 usr/lib32/libnvidia-tls.so.#VERSION#		usr/lib32/libnvidia-tls.so.1
 usr/lib32/tls/libnvidia-tls.so.#VERSION#	usr/lib32/tls/libnvidia-tls.so.1

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.install.in?rev=1398&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.install.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.install.in Tue Aug 10 12:20:03 2010
@@ -1,4 +1,4 @@
-usr/lib/libGL.so.#VERSION#
+usr/lib/libGL.so.#VERSION#				usr/lib/nvidia/
 usr/lib/libGLcore.so.#VERSION#
 usr/lib/libnvidia-cfg.so.#VERSION#
 usr/lib/libnvidia-tls.so.#VERSION#

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.links.in?rev=1398&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.links.in Tue Aug 10 12:20:03 2010
@@ -1,4 +1,4 @@
-usr/lib/libGL.so.#VERSION#				usr/lib/libGL.so.1
+usr/lib/nvidia/libGL.so.#VERSION#			usr/lib/nvidia/libGL.so.1
 usr/lib/libGLcore.so.#VERSION#				usr/lib/libGLcore.so.1
 usr/lib/libnvidia-cfg.so.#VERSION#			usr/lib/libnvidia-cfg.so.1
 usr/lib/libnvidia-tls.so.#VERSION#			usr/lib/libnvidia-tls.so.1

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=1398&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Tue Aug 10 12:20:03 2010
@@ -169,7 +169,15 @@
 	dh_bugfiles -A
 
 override_dh_makeshlibs:
+	test ! -d debian/libgl1-nvidia$(legacy)-glx/usr/lib/nvidia || \
+		ln -s nvidia/libGL.so.1 debian/libgl1-nvidia$(legacy)-glx/usr/lib/
+	test ! -d debian/libgl1-nvidia$(legacy)-glx-ia32/usr/lib32/nvidia || \
+		ln -s nvidia/libGL.so.1 debian/libgl1-nvidia$(legacy)-glx-ia32/usr/lib32/
 	dh_makeshlibs -Xvdpau/libvdpau_nvidia.so
+	test ! -d debian/libgl1-nvidia$(legacy)-glx || \
+		rm -f debian/libgl1-nvidia$(legacy)-glx/usr/lib/libGL.so.1
+	test ! -d debian/libgl1-nvidia$(legacy)-glx-ia32 || \
+		rm -f debian/libgl1-nvidia$(legacy)-glx-ia32/usr/lib32/libGL.so.1
 	# Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
 	test ! -d debian/libgl1-nvidia$(legacy)-glx || \
 		sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/libgl1-nvidia$(legacy)-glx/DEBIAN/shlibs




More information about the Pkg-nvidia-devel mailing list