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

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

Author: anbe-guest
Date: Wed Aug 11 12:09:53 2010
New Revision: 1402

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1402
Log:
a first attempt to handle libGL.so.1 via diversions

Added:
    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.prerm
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst
    packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.triggers

Added: 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=1402&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst Wed Aug 11 12:09:53 2010
@@ -1,0 +1,15 @@
+#!/bin/sh
+set -e
+
+
+if [ "$1" = "configure" ]; then
+
+	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
+
+fi
+
+
+#DEBHELPER#
+
+exit 0

Added: 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=1402&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm Wed Aug 11 12:09:53 2010
@@ -1,0 +1,15 @@
+#!/bin/sh
+set -e
+
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+
+	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
+
+fi
+
+
+#DEBHELPER#
+
+exit 0

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=1402&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 12:09:53 2010
@@ -4,6 +4,13 @@
 
 # A trigger that handles creating/removing /usr/lib/libGL.so
 if [ "$1" = "triggered" ]; then
+
+	if [ -L /usr/lib/nvidia/diversions/libGL.so.1 ]; then
+		update-alternatives --install /usr/lib/libGL.so.1 libGL.so.1 /usr/lib/nvidia/diversions/libGL.so.1 5
+	else
+		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
@@ -21,8 +28,13 @@
 
 
 if [ "$1" = "configure" ]; then
+
+	update-alternatives --install /usr/lib/libGL.so.1 libGL.so.1 /usr/lib/nvidia/libGL.so.1 42
+
 	# activate our trigger
+	dpkg-trigger /usr/lib/libGL.so.1
 	dpkg-trigger /usr/lib/libGL.so
+
 fi
 
 

Added: 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=1402&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm Wed Aug 11 12:09:53 2010
@@ -1,0 +1,15 @@
+#!/bin/sh
+set -e
+
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+
+	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
+
+fi
+
+
+#DEBHELPER#
+
+exit 0

Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.triggers
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.triggers?rev=1402&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.triggers (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.triggers Wed Aug 11 12:09:53 2010
@@ -1,2 +1,4 @@
+interest /usr/lib/libGL.so.1
 interest /usr/lib/libGL.so
-interest /usr/lib/nvidia/libGL.so.xlibmesa
+interest /usr/lib/nvidia/diversions/libGL.so.1
+interest /usr/lib/nvidia/diversions/libGL.so