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

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Sun Jan 13 01:09:55 2008
New Revision: 352

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=352
Log:
fix perms and root cmd

Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
    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/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/changelog?rev=352&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/changelog Sun Jan 13 01:09:55 2008
@@ -5,16 +5,9 @@
   * 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.
-
+  * rename tarball to nvidia-kernel.tar.bz2 for upcoming module packaging.
+    
  -- Randall Donald <rdonald at debian.org>  Mon, 07 Jan 2008 12:15:15 -0800
-
-nvidia-kernel (100.14.19-2) UNRELEASED; urgency=low
-
-  * Add linux-modules-nonfree-2.6 integration (closes: #446232)
-    - rename tarball to nvidia-kernel.tar.bz2
-    - add toplevel Makefile
-
- -- Randall Donald <rdonald at debian.org>  Thu, 01 Nov 2007 10:23:13 -0700
 
 nvidia-kernel (100.14.19-1) unstable; urgency=low
 

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=352&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Sun Jan 13 01:09:55 2008
@@ -8,6 +8,10 @@
 # This is the debhelper compatability version to use.
 export DH_COMPAT=4
 
+ifeq ($(shell id -u),0)
+     ROOT_CMD=
+endif
+	
 
 
 dirname=nv
@@ -286,8 +290,8 @@
 .PHONY: kdist_image
 kdist_image:
 	    echo "ROOT_CMD = $(ROOT_CMD)"
-	    $(MAKE) $(MFLAGS) -f debian/rules binary_modules
-	    $(MAKE) $(MFLAGS) -f debian/rules clean
+	    $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
+	    $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
  
 
 
@@ -299,7 +303,7 @@
 	     $(MAKE) $(MFLAGS) -f debian/rules clean
 
 kdist: 
-	$(MAKE) $(MFLAGS) -f debian/rules binary_modules
+	$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
 	# Build a .changes file.
 	dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(CURDIR)/../.." > $(CHFILE)
 	debsign -e"$(KMAINT) <$(KEMAIL)>" $(CHFILE)

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=352&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Jan 13 01:09:55 2008
@@ -1,3 +1,10 @@
+nvidia-graphics-drivers (169.07-2) UNRELEASED; urgency=low
+
+  * Fix permissions on patches.old (closes: #459848, #460173)
+  * fix root_cmd (closes: #459833)
+
+ -- Randall Donald <rdonald at debian.org>  Sat, 12 Jan 2008 14:39:35 -0800
+
 nvidia-graphics-drivers (169.07-1) unstable; urgency=low
 
   * New upstream.

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=352&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Jan 13 01:09:55 2008
@@ -92,8 +92,8 @@
 	    # build kernel module source tarball
 	    mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/debian
 	    mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/nv
-	    cp -r $(CURDIR)/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel/debian
-	    
+	    cp -a $(CURDIR)/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel/debian
+	       
 	    for f in `ls $(CURDIR)/debian.binary` ; do \
 		perl -p \
 		-e 's{#BASE_VERSION#}{$(base_version)}g;' \
@@ -109,6 +109,7 @@
 	    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
+	    chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches.old
 	    tar -jcvf $(CURDIR)/nvidia-kernel.tar.bz2 -C $(CURDIR)/debian/temp modules
 	    rm -rf debian/temp 
 	    touch build-kernel-stamp