[pkg-nvidia-devel] r677 - in /packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian: changelog nvidia-glx-legacy-96xx-ia32.links.in nvidia-glx-legacy-96xx-ia32.postrm nvidia-glx-legacy-96xx-ia32.preinst

rdonald at users.alioth.debian.org rdonald at users.alioth.debian.org
Mon Dec 14 02:21:54 UTC 2009


Author: rdonald
Date: Mon Dec 14 02:21:53 2009
New Revision: 677

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=677
Log:
ia32 stuff

Modified:
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links.in
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.preinst

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog?rev=677&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog Mon Dec 14 02:21:53 2009
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers-legacy-96xx (96.43.14-2) unstable; urgency=low
+
+  * divert ia32-libs (closes: #559474)
+
+ -- Randall Donald <rdonald at debian.org>  Sun, 13 Dec 2009 18:20:15 -0800
+
 nvidia-graphics-drivers-legacy-96xx (96.43.14-1) unstable; urgency=low
 
   * New Upstream

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links.in?rev=677&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.links.in Mon Dec 14 02:21:53 2009
@@ -1,3 +1,4 @@
 usr/lib32/libGL.so.#VERSION# usr/lib32/libGL.so.1
+usr/lib32/libGL.so.#VERSION# usr/lib32/libGL.so
 usr/lib32/libGLcore.so.#VERSION# usr/lib32/libGLcore.so
 usr/lib32/libnvidia-tls.so.#VERSION# usr/lib32/libnvidia-tls.so.1

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm?rev=677&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.postrm Mon Dec 14 02:21:53 2009
@@ -20,28 +20,21 @@
     remove|purge)
 
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
+		/usr/lib32/nvidia/libGL.so.1.ia32-libs \
+		/usr/lib32/libGL.so.1 > /dev/null
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
+		/usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
+		/usr/lib32/libGL.so.1.2 > /dev/null
 	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
-
-	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
-	dpkg-divert --remove --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
+		/usr/lib32/nvidia/libGL.so.ia32-libs \
+		/usr/lib32/libGL.so > /dev/null
 
 	test -d /emul/ia32-linux/usr/lib/nvidia && \
 		rmdir /emul/ia32-linux/usr/lib/nvidia || true;
-
+        test -d /usr/lib32/nvidia && \
+	                rmdir /usr/lib32/nvidia || true;
+			
+			
 	ldconfig
 		
     ;;

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.preinst?rev=677&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.preinst Mon Dec 14 02:21:53 2009
@@ -17,30 +17,22 @@
     install|upgrade)
 	
 	# create new diversion directories
-	test -d /emul/ia32-linux/usr/lib/nvidia || \
-		mkdir -p /emul/ia32-linux/usr/lib/nvidia || true
+	test -d /usr/lib32/nvidia || \
+		mkdir -p usr/lib32/nvidia || true
 	
 	# make diversions
 	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
+		/usr/lib32/nvidia/libGL.so.1.ia32-libs \
+		/usr/lib32/libGL.so.1 > /dev/null
 	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
+		/usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
+		/usr/lib32/libGL.so.1.2 > /dev/null
 	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
+		/usr/lib32/nvidia/libGL.so.ia32-libs \
+		/usr/lib32/libGL.so > /dev/null
 
-	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
-	dpkg-divert --add --rename --package nvidia-glx-legacy-96xx-ia32 --divert \
-		/emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
-		/emul/ia32-linux/usr/lib/libGL.so > /dev/null
-
+       test ! -L /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1 || \
+                       rm /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1 || true
     ;;
 
     abort-upgrade)




More information about the Pkg-nvidia-devel mailing list