[pkg-nvidia-devel] r607 - in /packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian: changelog nvidia-glx-legacy-96xx-ia32.dirs rules

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Fri Oct 16 19:27:03 2009
New Revision: 607

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=607
Log:
add lib32 trans

Modified:
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.dirs
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules

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=607&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog Fri Oct 16 19:27:03 2009
@@ -2,6 +2,10 @@
 
   [ Len Sorensen ]
   * New upstream release supporting newer kernels.
+
+  [ Randall Donald ]
+  * Make sure both kernel modules are included
+  * transition to lib32
 
  -- Randall Donald <rdonald at debian.org>  Thu, 15 Oct 2009 15:34:31 -0700
 

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.dirs?rev=607&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.dirs (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-legacy-96xx-ia32.dirs Fri Oct 16 19:27:03 2009
@@ -1,2 +1,2 @@
-emul/ia32-linux/usr/lib
-emul/ia32-linux/usr/lib/tls
+usr/lib32
+usr/lib32/tls

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules?rev=607&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules Fri Oct 16 19:27:03 2009
@@ -115,8 +115,7 @@
 
 		# We want both 32 and 64 bit versions of nv-kernel.o
 	    cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o.x86_64
-		mv $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o.i386
-
+	    cp $(CURDIR)/$(dirname_x86)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.i386
 		# and then make Makefile.kbuild actually use our names
 		sed -i -e 's/nv-kernel.o$$/nv-kernel.o$$(NVARCH)/' $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/Makefile.kbuild
 
@@ -219,21 +218,21 @@
 
 	if [ "$(DEB_BUILD_ARCH)" = "amd64" ] ; then \
 		install $(dirname)/usr/lib32/libGLcore.so.${version} \
-			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libGL.so.${version} \
-			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
 		-install $(dirname)/usr/lib32/libcuda.so.${version} \
-			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
 		-install $(dirname)/usr/lib32/libvdpau.so.${version} \
-			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
 		-install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
-			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
 		-install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \
-			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
-			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \
-			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib/tls ; \
+			$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/usr/lib32/tls ; \
 	fi
 
 	install -m 755 $(dirname)/usr/bin/nvidia-bug-report.sh $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/bin/