[pkg-nvidia-devel] r979 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog nvidia-glx-dev.links nvidia-glx-ia32.links.in nvidia-glx-ia32.lintian-overrides.in

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Wed Jun  2 08:59:40 2010
New Revision: 979

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=979
Log:
  * nvidia-glx-{dev,ia32}: ship /usr/lib{,32}/nvidia/libGL.so, allowing
    explicit linking with the NVIDIA OpenGL implementation via
    ... -L/usr/lib/nvidia -lGL ...

Added:
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=979&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Jun  2 08:59:40 2010
@@ -29,7 +29,11 @@
   * stop creating/removing /usr/lib/libGL.so in the maintainer scripts and the
     init script (closes: #422002, #546210)
   * nvidia-glx{,-ia32}: ship (possibly dangling) /usr/lib{,32}/libGL.so
-    symlink pointing to the diverted libGL.so.1.2 from libgl1-mesa-glx
+    symlink pointing to the diverted libGL.so.1.2 from libgl1-mesa-glx for
+    linking with the MESA OpenGL implementation by default via ... -lGL ...
+  * nvidia-glx-{dev,ia32}: ship /usr/lib{,32}/nvidia/libGL.so, allowing
+    explicit linking with the NVIDIA OpenGL implementation via
+    ... -L/usr/lib/nvidia -lGL ...
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links?rev=979&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links Wed Jun  2 08:59:40 2010
@@ -1,0 +1,1 @@
+usr/lib/libGL.so.1	usr/lib/nvidia/libGL.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in?rev=979&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in Wed Jun  2 08:59:40 2010
@@ -1,4 +1,5 @@
 usr/lib32/libGL.so.#VERSION#			usr/lib32/libGL.so.1
+usr/lib32/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/nvidia-glx-ia32.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in?rev=979&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in Wed Jun  2 08:59:40 2010
@@ -9,9 +9,6 @@
 # programs don't pick up the wrong libGL by mistake.
 nvidia-glx#LEGACY#-ia32: diversion-for-unknown-file
 
-# The diversions are placed here.
-nvidia-glx#LEGACY#-ia32: package-contains-empty-directory usr/lib32/nvidia/
-
 # Packages built against the NVIDIA libGL should declare dependencies on
 # the free version for Debian's purposes.
 nvidia-glx#LEGACY#-ia32: shlibs-declares-dependency-on-other-package ia32-libs*