Index: debian/README.source
===================================================================
--- debian/README.source	(.../anbe-276-rules.defs)	(revision 2231)
+++ debian/README.source	(.../anbe-278-new-orig-tar-gz)	(revision 2231)
@@ -1,28 +1,42 @@
 Importing a New Upstream Release
 
     The *.orig.tar.gz file for nvidia-graphics-drivers contains just a
-    directory named nvidia-graphics-drivers-<version>.orig containing the
+    directory named nvidia-graphics-drivers-<version> containing the
     upstream pkg0.run file for i386 and the pkg2.run file for amd64.
+    (Only the .pkg2.run file includes the ia32 libraries.)
     Everything else comes from the Subversion repository for the package.
 
     Use the following steps to update to a new upstream release:
 
-    * Download the pkg0.run file for i386 and the pkg2.run file for amd64
-      from upstream.  The pkg2.run file has the ia32 libraries in it.
-      uscan can be used to download the two files.
+    * Check for a new version
 
-    * mkdir nvidia-graphics-drivers-190.53.orig and place package files in
-      that directory.  Make them executable.  Then, create the orig
-      tarball with:
+          uscan --report
 
-          tar czvf nvidia-graphics-drivers_190.53.orig.tar.gz
+    * Create a changelog entry for the new version
 
+          debchange --newversion <version>
+
+    * Download the driver archives and create a new .orig.tar.gz
+
+          debian/rules get-orig-source
+
+      Alternatively do it manually:
+      - Download the pkg0.run file for i386 and the pkg2.run file for
+        amd64 from upstream.
+      - mkdir nvidia-graphics-drivers-<version> and place package files
+        in that directory.  Make them executable.  Then, create the orig
+        tarball with:
+            tar czvf nvidia-graphics-drivers_<version>.orig.tar.gz
+
     * Edit debian/rules.defs in the Debian package and change
       NVIDIA_RELEASE to the appropriate value.
 
     * Edit debian/module/conftest.h if necessary for kernel compatibility
       and test.
 
+    * Add the new *.orig.tar.gz to the tarballs directory in the svn
+      repository: svn://svn.debian.org/svn/pkg-nvidia/tarballs
+
 Building and Uploading
 
     At present, the package is not automatically built by the buildds.
Index: debian/rules
===================================================================
--- debian/rules	(.../anbe-276-rules.defs)	(revision 2231)
+++ debian/rules	(.../anbe-278-new-orig-tar-gz)	(revision 2231)
@@ -140,3 +140,18 @@
 debian/libcuda1-ia32.symbols: debian/libcuda1.symbols
 	sed 's/libcuda1/libcuda1-ia32/g' $< > $@
 
+
+.PHONY: get-orig-source
+get-orig-source:
+	rm -rf get-orig-source || true
+	mkdir get-orig-source
+	uscan --no-symlink --download-current-version --destdir get-orig-source
+	@set -e -x ; \
+		cd get-orig-source ; \
+		newversion=$$(ls *-x86-*.run | sed -e 's/.*-\([0-9.]*\)-.*/\1/') ; \
+		mkdir nvidia-graphics-drivers-$$newversion ; \
+		mv *.run nvidia-graphics-drivers-$$newversion/ ; \
+		chmod 0755 nvidia-graphics-drivers-$$newversion/* ; \
+		tar cfvz ../../nvidia-graphics-drivers_$$newversion.orig.tar.gz --owner=root --group=src nvidia-graphics-drivers-$$newversion
+	rm -rf get-orig-source || true
+
Index: debian/changelog
===================================================================
--- debian/changelog	(.../anbe-276-rules.defs)	(revision 2231)
+++ debian/changelog	(.../anbe-278-new-orig-tar-gz)	(revision 2231)
@@ -107,6 +107,9 @@
     packages built from nvidia-kernel-source
   * replace shell script debian/upstream_info with makefile fragment
     debian/rules.defs
+  * debian/rules, debian/README.source: add new target get-orig-source and
+    simplify instructions for tarball creation:
+    uscan --report && dch -v <version> && debian/rules get-orig-source
 
  -- Russ Allbery <rra@debian.org>  Sat, 24 Apr 2010 20:35:20 -0700