[pkg-nvidia-devel] r346 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/rules debian/changelog debian/rules

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Mon Jan  7 20:17:26 2008
New Revision: 346

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=346
Log:
first 169.07?

Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/rules
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=346&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Mon Jan  7 20:17:26 2008
@@ -44,6 +44,7 @@
 version="^Linux version [^(]* (.*@.*) (\(gcc.*\)) .*"
 kernel_cc:=$(shell cat /proc/version | sed "s/"$(version)"/\1/")
 
+kernel_arch:=$(shell uname -m)
 module_cc:=$(shell echo "$(module_cc)" | sed 's/.* \([0-9.]*\.[0-9]\).*/\1/')
 kernel_cc:=$(shell echo "$(kernel_cc)" | sed 's/.* \([0-9.]*\.[0-9]\).*/\1/')
 
@@ -140,6 +141,9 @@
 	dh_testdir
 	dh_testroot
 
+	if [ "$(kernel_arch)" = "x86_64" ]; then \
+		cp $(CURDIR)/nv-kernel.o.x86_64 $(CURDIR)/nv/nv-kernel.o ; \
+	fi   
 	@echo "PATCHLEVEL = $(PATCHLEVEL) " ;
 	@echo "Kernel compiler version : $(kernel_cc)" ; 
 	@echo "Detected compiler version : $(module_cc)" ;

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=346&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon Jan  7 20:17:26 2008
@@ -1,12 +1,12 @@
-nvidia-graphics-drivers (169.07-1) UNRELEASED; urgency=low
+nvidia-graphics-drivers (169.07-1) unstable; urgency=low
 
   * New upstream.
   * Remove ROOT_CMD from debian.binary/rules (closes: 416594)
-  * include both nv-kernel.o and detect which to use at kernel-source
+  * always include x86_64 nv-kernel.o and detect which to use at kernel-source
   build time. (closes: #458295, #437128)
   * move patches dir out of the way.
 
- -- Randall Donald <rdonald at debian.org>  Fri, 21 Dec 2007 22:54:29 -0800
+ -- Randall Donald <rdonald at debian.org>  Mon, 07 Jan 2008 12:15:15 -0800
 
 nvidia-graphics-drivers (100.14.19-2) UNRELEASED; urgency=low
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=346&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Mon Jan  7 20:17:26 2008
@@ -106,7 +106,6 @@
 	    done
 #	    chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches	    
 	    cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel/nv || true
-	    cp $(CURDIR)/$(dirname_x86)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86 || true
 	    cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64 || true
 	    chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/rules
 	    chown -R root:src $(CURDIR)/debian/temp/modules