[pkg-nvidia-devel] r1403 - in /packages/nvidia-graphics-drivers/trunk/debian: libgl1-nvidia-dev.postinst libgl1-nvidia-dev.prerm libgl1-nvidia-glx-ia32.links.in libgl1-nvidia-glx-ia32.postinst libgl1-nvidia-glx-ia32.prerm libgl1-nvidia-glx.postinst libgl1-nvidia-glx.prerm

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

Author: anbe-guest
Date: Wed Aug 11 13:28:58 2010
New Revision: 1403

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1403
Log:
handle libGL.so symlink via alternatives

Added:
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.postinst
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.prerm
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm

Added: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.postinst?rev=1403&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.postinst (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.postinst Wed Aug 11 13:28:58 2010
@@ -1,0 +1,16 @@
+#!/bin/sh
+set -e
+
+
+if [ "$1" = "configure" ]; then
+
+	# disabled in order to prevent compile time linking vs. libGL.so.1 from NVIDIA
+	#update-alternatives --install /usr/lib/libGL.so libGL.so /usr/lib/nvidia/libGL.so 42
+	:
+
+fi
+
+
+#DEBHELPER#
+
+exit 0

Added: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.prerm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.prerm?rev=1403&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.prerm (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.prerm Wed Aug 11 13:28:58 2010
@@ -1,0 +1,14 @@
+#!/bin/sh
+set -e
+
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+
+	update-alternatives --remove libGL.so /usr/lib/nvidia/libGL.so
+
+fi
+
+
+#DEBHELPER#
+
+exit 0

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=1403&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 Wed Aug 11 13:28:58 2010
@@ -3,4 +3,3 @@
 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/diversions/libGL.so		usr/lib32/libGL.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst?rev=1403&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst Wed Aug 11 13:28:58 2010
@@ -7,6 +7,10 @@
 	update-alternatives --install /usr/lib32/libGL.so.1 ia32-libGL.so.1 /usr/lib32/nvidia/libGL.so.1 42
 	update-alternatives --install /usr/lib32/libGL.so.1 ia32-libGL.so.1 /usr/lib32/nvidia/diversions/libGL.so.1 5
 
+	update-alternatives --install /usr/lib32/libGL.so ia32-libGL.so /usr/lib32/nvidia/diversions/libGL.so.1 9995
+	# disabled in order to prevent compile time linking vs. libGL.so.1 from NVIDIA
+	#update-alternatives --install /usr/lib32/libGL.so ia32-libGL.so /usr/lib32/nvidia/libGL.so 42
+
 fi
 
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm?rev=1403&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm Wed Aug 11 13:28:58 2010
@@ -3,6 +3,9 @@
 
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+
+	update-alternatives --remove ia32-libGL.so /usr/lib32/nvidia/libGL.so
+	update-alternatives --remove ia32-libGL.so /usr/lib32/nvidia/diversions/libGL.so
 
 	update-alternatives --remove ia32-libGL.so.1 /usr/lib32/nvidia/diversions/libGL.so.1
 	update-alternatives --remove ia32-libGL.so.1 /usr/lib32/nvidia/libGL.so.1

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst?rev=1403&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst Wed Aug 11 13:28:58 2010
@@ -11,19 +11,14 @@
 		update-alternatives --remove libGL.so.1 /usr/lib/nvidia/diversions/libGL.so.1
 	fi
 
-	LINK_origin=/usr/lib/libGL.so
-	LINK_diverted=/usr/lib/nvidia/diversions/libGL.so
-	LINK_create=nvidia/diversions/libGL.so
+	if [ -L /usr/lib/nvidia/diversions/libGL.so ]; then
+		# libgl-mesa-dev was installed, create libGL.so
+		update-alternatives --install /usr/lib/libGL.so libGL.so /usr/lib/nvidia/diversions/libGL.so 9995
+	else
+		# libgl-mesa-dev was removed, drop libGL.so
+		update-alternatives --remove libGL.so /usr/lib/nvidia/diversions/libGL.so
+	fi
 
-	if [ -L "$LINK_origin" ] && [ ! -L "$LINK_diverted" ]; then
-		# libgl-mesa-dev was removed, drop libGL.so
-		echo "$DPKG_MAINTSCRIPT_PACKAGE: Removing $LINK_origin"
-		rm -f "$LINK_origin"
-	elif [ ! -L "$LINK_origin" ] && [ -L "$LINK_diverted" ]; then
-		# libgl-mesa-dev was installed, create libGL.so
-		echo "$DPKG_MAINTSCRIPT_PACKAGE: Creating $LINK_origin"
-		ln -s "$LINK_create" "$LINK_origin"
-	fi
 fi
 
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm?rev=1403&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm Wed Aug 11 13:28:58 2010
@@ -3,6 +3,8 @@
 
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+
+	update-alternatives --remove libGL.so /usr/lib/nvidia/diversions/libGL.so
 
 	update-alternatives --remove libGL.so.1 /usr/lib/nvidia/diversions/libGL.so.1
 	update-alternatives --remove libGL.so.1 /usr/lib/nvidia/libGL.so.1