Index: debian/changelog
===================================================================
--- debian/changelog	(.../anbe-04-legacy-support)	(revision 2468)
+++ debian/changelog	(.../anbe-05-long-version-subpackages)	(revision 2468)
@@ -10,6 +10,10 @@
   * Build for 2.6.32-5.
   * Use nvidia-kernel-source 195.36.24.
   * Add support for building legacy modules.
+  * The packages built from nvidia-kernel-source now embed the kernel package
+    version and therefore the dummy packages generated from our debian/control
+    need to be removed in order not to upload two copies of a package with
+    just small differences in the version number.
 
  -- Andreas Beckmann <debian@abeckmann.de>  Mon, 10 May 2010 01:49:13 +0200
 
Index: debian/rules
===================================================================
--- debian/rules	(.../anbe-04-legacy-support)	(revision 2468)
+++ debian/rules	(.../anbe-05-long-version-subpackages)	(revision 2468)
@@ -71,12 +71,18 @@
 			KVERS=$* \
 			HAVECONFIG=y \
 			debian/rules clean
+	# Replace dummy deb and entry in debian/files, the package just built
+	# has a more detailed version number.
+	@set -e -x; for deb in *$**.deb; do \
+	    : Register $$deb ; \
+	    p=$${deb%%_*} ; \
+	    sed -i -e "/^$${p}_/d" debian/files ; \
+	    rm ../$${p}_* ; \
+	    mv $$deb .. ; \
+	    dpkg-distaddfile $$deb "non-free/kernel" optional ;\
+	done
 
 binary-arch: build binary-arch-meta $(foreach f,$(KERNEL_FLAVORS_$(DEB_BUILD_ARCH)),binary-module-$(KERNEL_VERSION)-$(f))
-	for p in *.deb; do \
-	    dpkg-distaddfile $$p "non-free/kernel" optional; \
-	done
-	mv *.deb ..
 
 binary: binary-indep binary-arch
 .PHONY: build build-arch build-indep clean binary binary-arch binary-indep