[pkg-nvidia-devel] r1423 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control libglx-nvidia-alternatives.postinst libglx-nvidia-alternatives.postrm

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

Author: anbe-guest
Date: Tue Aug 24 23:40:16 2010
New Revision: 1423

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1423
Log:
Divert the debug symbols of libglx.so from Xorg, too.

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst
    packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postrm

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1423&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Tue Aug 24 23:40:16 2010
@@ -5,6 +5,7 @@
   * Change handling of Xorg module libglx.so to use alternatives, too.  Move
     the diversion of libglx.so to new package libglx-nvidia-alternatives and
     use a trigger there to create the alternatives.
+  * Divert the debug symbols of libglx.so from Xorg, too.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 24 Aug 2010 19:27:52 +0200
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1423&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Tue Aug 24 23:40:16 2010
@@ -596,4 +596,5 @@
 Description: simplifies replacing Xorg module libglx.so with GPU vendor library
  Diverts the free Xorg module libglx.so (Xorg) and introduces alternatives
  to simplify plugging in accelerated implementations from GPU vendors.
-
+ Handles both libglx.so and its debug symbols.
+

Modified: packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst?rev=1423&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postinst Tue Aug 24 23:40:16 2010
@@ -6,7 +6,8 @@
 if [ "$1" = "triggered" ]; then
 
 	if [ -e /usr/lib/nvidia/diversions/libglx.so ]; then
-		update-alternatives --install /usr/lib/xorg/modules/extensions/libglx.so libglx.so /usr/lib/nvidia/diversions/libglx.so 5
+		update-alternatives --install /usr/lib/xorg/modules/extensions/libglx.so libglx.so /usr/lib/nvidia/diversions/libglx.so 5 \
+			--slave /usr/lib/debug/usr/lib/xorg/modules/extensions/libglx.so libglx.so.dbg /usr/lib/nvidia/diversions/libglx.so.dbg
 	else
 		update-alternatives --remove libglx.so /usr/lib/nvidia/diversions/libglx.so
 	fi
@@ -84,6 +85,9 @@
 	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
 		/usr/lib/nvidia/diversions/libglx.so \
 		/usr/lib/xorg/modules/extensions/libglx.so
+	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/usr/lib/nvidia/diversions/libglx.so.dbg \
+		/usr/lib/debug/usr/lib/xorg/modules/extensions/libglx.so
 
 	# activate our trigger
 	dpkg-trigger /usr/lib/xorg/modules/extensions/libglx.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postrm?rev=1423&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libglx-nvidia-alternatives.postrm Tue Aug 24 23:40:16 2010
@@ -23,6 +23,9 @@
     remove)
 
 	dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/usr/lib/nvidia/diversions/libglx.so.dbg \
+		/usr/lib/debug/usr/lib/xorg/modules/extensions/libglx.so
+	dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
 		/usr/lib/nvidia/diversions/libglx.so \
 		/usr/lib/xorg/modules/extensions/libglx.so