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

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

Author: anbe-guest
Date: Wed Jun  2 08:34:47 2010
New Revision: 977

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=977
Log:
  * nvidia-glx{,-ia32}: ship (possibly dangling) /usr/lib{,32}/libGL.so
    symlink pointing to the diverted libGL.so.1.2 from libgl1-mesa-glx

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
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.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=977&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Jun  2 08:34:47 2010
@@ -28,6 +28,8 @@
   * add/update old NEWS entries about the legacy drivers
   * 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
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

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=977&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:34:47 2010
@@ -1,5 +1,5 @@
 usr/lib32/libGL.so.#VERSION#			usr/lib32/libGL.so.1
-usr/lib32/libGL.so.1				usr/lib32/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
+usr/lib32/nvidia/libGL.so.1.2.ia32-libs		usr/lib32/libGL.so

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=977&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:34:47 2010
@@ -16,5 +16,7 @@
 # the free version for Debian's purposes.
 nvidia-glx#LEGACY#-ia32: shlibs-declares-dependency-on-other-package ia32-libs*
 
-# A single symbolic link does not justify the creation of a new package.
+# We diverted the original /usr/lib32/libGL.so symlink.
+# In order to retain its functionality (i.e. pointing the MESA libGL.so.1)
+# we ship a link pointing to the diverted library.
 nvidia-glx#LEGACY#-ia32: non-dev-pkg-with-shlib-symlink

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in?rev=977&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in Wed Jun  2 08:34:47 2010
@@ -6,3 +6,4 @@
 usr/lib/xorg/modules/extensions/libglx.so.#VERSION#	usr/lib/xorg/modules/extensions/libglx.so
 usr/lib/libXvMCNVIDIA.so.#VERSION#			usr/lib/libXvMCNVIDIA.so.1
 usr/lib/libXvMCNVIDIA.so.#VERSION#			usr/lib/libXvMCNVIDIA_dynamic.so.1
+usr/lib/nvidia/libGL.so.1.2.xlibmesa			usr/lib/libGL.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in?rev=977&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in Wed Jun  2 08:34:47 2010
@@ -20,3 +20,8 @@
 
 # Referenced by upstream documentation.
 nvidia-glx#LEGACY#: script-with-language-extension usr/bin/nvidia-bug-report.sh
+
+# We diverted the original /usr/lib/libGL.so symlink.
+# In order to retain its functionality (i.e. pointing the MESA libGL.so.1)
+# we ship a link pointing to the diverted library.
+nvidia-glx#LEGACY#: non-dev-pkg-with-shlib-symlink