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

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

Author: anbe-guest
Date: Thu Jun  3 11:20:31 2010
New Revision: 986

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=986
Log:
drop .shlibs files, accidental linking with libGL.so.1 from NVIDIA is prevented in a different way

Removed:
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.shlibs.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs.in
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.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=986&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Jun  3 11:20:31 2010
@@ -41,7 +41,9 @@
     to explicitly compile with the NVIDIA headers use -I/usr/include/nvidia
   * remove the now function-less /etc/init.d/nvidia-glx script
   * nvidia-glx.prerm, nvidia-glx-dev.postrm: drop empty maintainer scripts
-  * nvidia-glx{,-ia32}: add symbols control files
+  * nvidia-glx{,-ia32}: add symbols control files and drop .shlibs files,
+    accidental linking with libGL.so.1 from NVIDIA is prevented in a different
+    way
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

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=986&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 Thu Jun  3 11:20:31 2010
@@ -9,10 +9,6 @@
 # programs don't pick up the wrong libGL by mistake.
 nvidia-glx#LEGACY#-ia32: diversion-for-unknown-file
 
-# 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*
-
 # 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.

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=986&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 Thu Jun  3 11:20:31 2010
@@ -14,10 +14,6 @@
 # The diversions are placed here.
 nvidia-glx#LEGACY#: package-contains-empty-directory usr/lib/nvidia/
 
-# Packages built against the NVIDIA libGL should declare dependencies on
-# the free version for Debian's purposes.
-nvidia-glx#LEGACY#: shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
-
 # Referenced by upstream documentation.
 nvidia-glx#LEGACY#: script-with-language-extension usr/bin/nvidia-bug-report.sh