[pkg-nvidia-devel] r952 - in /packages/nvidia-graphics-modules/trunk/debian: changelog rules

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Sat May 29 14:03:21 2010
New Revision: 952

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=952
Log:
  * The packages built from nvidia-kernel-source now embed the version of the
    linux-headers-* package in their version. Therefore the dummy packages
    generated from our debian/control need to be removed in order not to
    include in the .changes file two copies of a package with just small
    differences in the version number.

Modified:
    packages/nvidia-graphics-modules/trunk/debian/changelog
    packages/nvidia-graphics-modules/trunk/debian/rules

Modified: packages/nvidia-graphics-modules/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/changelog?rev=952&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-modules/trunk/debian/changelog Sat May 29 14:03:21 2010
@@ -4,6 +4,11 @@
   * Build for 2.6.32-5.
   * Use nvidia-kernel-source 195.36.24.
   * Correct the Vcs-* URLs.
+  * The packages built from nvidia-kernel-source now embed the version of the
+    linux-headers-* package in their version. Therefore the dummy packages
+    generated from our debian/control need to be removed in order not to
+    include in the .changes file two copies of a package with just small
+    differences in the version number.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Sat, 29 May 2010 15:41:11 +0200
 

Modified: packages/nvidia-graphics-modules/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/rules?rev=952&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/rules (original)
+++ packages/nvidia-graphics-modules/trunk/debian/rules Sat May 29 14:03:21 2010
@@ -70,12 +70,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