Apply this patch after doing the following renames:

svn mkdir debian/module
svn mv debian.binary debian/module/debian
svn mv Makefile conftest.h conftest.sh patches.h debian/module


Index: debian/README.source
===================================================================
--- debian/README.source	(.../anbe-263-shuffle)	(revision 2180)
+++ debian/README.source	(.../anbe-265-source-format-3.0)	(revision 2180)
@@ -20,7 +20,8 @@
     * Edit debian/upstream_info in the Debian package and change RELEASE
       to the appropriate value.
 
-    * Edit conftest.h if necessary for kernel compatibility and test.
+    * Edit debian/module/conftest.h if necessary for kernel compatibility
+      and test.
 
 Building and Uploading
 
Index: debian/rules
===================================================================
--- debian/rules	(.../anbe-263-shuffle)	(revision 2180)
+++ debian/rules	(.../anbe-265-source-format-3.0)	(revision 2180)
@@ -17,8 +17,8 @@
 AUTOGEN		+= $(patsubst %.in,%,$(TEMPLATES))
 AUTOGEN		+= debian/libcuda1-ia32.symbols
 AUTOGEN		+= debian/nvidia-libvdpau1-ia32.symbols
-AUTOGEN		+= debian.binary/control.template
-AUTOGEN		+= debian.binary/changelog
+AUTOGEN		+= debian/module/debian/control.template
+AUTOGEN		+= debian/module/debian/changelog
 AUTOKEEP	 = debian/copyright
 AUTOCLEAN	 = $(filter-out $(AUTOKEEP),$(AUTOGEN))
 
@@ -61,11 +61,9 @@
 	cp -a NVIDIA-Linux-amd64/usr/src/nv/nv-kernel.o debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
 	rm -f debian/temp/modules/nvidia-kernel/nv-kernel.o
 
-	# We have new conftest files that work purely with kbuild and don't require root
-	cp -a Makefile conftest.* patches.h debian/temp/modules/nvidia-kernel/
-
-	# Prepare debian files for module package
-	cp -a debian.binary/* debian/temp/modules/nvidia-kernel/debian/
+	# Install a debian/ tree and new conftest files that work purely with kbuild
+	# and don't require root into the module package
+	cp -a debian/module/* debian/temp/modules/nvidia-kernel/
 	cp -a debian/copyright debian/temp/modules/nvidia-kernel/debian/
 
 	# Fix permissions
@@ -131,7 +129,7 @@
 	-e 's{#URL_X86_64#}{$(url_x86_64)}g;' \
 	< $< > $@
 
-debian.binary/changelog: debian/changelog
+debian/module/debian/changelog: debian/changelog
 	sed 's/^nvidia-graphics-drivers/nvidia-kernel/g' $< > $@
 
 debian/nvidia-libvdpau1-ia32.symbols: debian/nvidia-libvdpau1.symbols.i386
Index: debian/source/format
===================================================================
--- debian/source/format	(.../anbe-263-shuffle)	(revision 2180)
+++ debian/source/format	(.../anbe-265-source-format-3.0)	(revision 2180)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
Index: debian/module/debian/source/format
===================================================================
--- debian/module/debian/source/format	(.../anbe-263-shuffle)	(revision 0)
+++ debian/module/debian/source/format	(.../anbe-265-source-format-3.0)	(revision 2180)
@@ -0,0 +1 @@
+1.0
Index: debian/changelog
===================================================================
--- debian/changelog	(.../anbe-263-shuffle)	(revision 2180)
+++ debian/changelog	(.../anbe-265-source-format-3.0)	(revision 2180)
@@ -85,6 +85,13 @@
   * update lintian overrides
   * debian/rules: generate most parts of the AUTOGEN list automatically
   * debian/changelog, debian/*.README*: whitespace cleanup
+  * move files: debian.binary/ ==> debian/module/debian/,
+    Makefile, conftest.*, patches.h ==> debian/module/
+  * debian/rules: adjust for debian/module/
+  * switch to source format 3.0 (quilt)
+  * debian/module/debian/: set source format 1.0, the module source "package"
+    is shipped as .tar.bz2 and unpacked with tar, therefore no newer features
+    can be used
 
  -- Russ Allbery <rra@debian.org>  Sat, 24 Apr 2010 20:35:20 -0700