[pkg-nvidia-devel] r813 - in /packages/nvidia-graphics-modules-i386/trunk: control.template debian/changelog debian/rules

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Apr 25 03:43:37 2010
New Revision: 813

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=813
Log:
Use control.template from nvidia-kernel-source

[ Andreas Beckmann ]
* use control.template from nvidia-kernel-source
* keep the original changelog from nvidia-kernel-source as
  changelog.nvidia-kernel-source
* debian/rules
  - improve readability of binary-arch target
  - stop special handling of the amd64 package, the module source already
    cares for linking with the correct binary object file

Removed:
    packages/nvidia-graphics-modules-i386/trunk/control.template
Modified:
    packages/nvidia-graphics-modules-i386/trunk/debian/changelog
    packages/nvidia-graphics-modules-i386/trunk/debian/rules

Modified: packages/nvidia-graphics-modules-i386/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules-i386/trunk/debian/changelog?rev=813&op=diff
==============================================================================
--- packages/nvidia-graphics-modules-i386/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-modules-i386/trunk/debian/changelog Sun Apr 25 03:43:37 2010
@@ -1,3 +1,16 @@
+nvidia-graphics-modules-i386 (190.53+2) UNRELEASED; urgency=low
+
+  [ Andreas Beckmann ]
+  * use control.template from nvidia-kernel-source
+  * keep the original changelog from nvidia-kernel-source as
+    changelog.nvidia-kernel-source
+  * debian/rules
+    - improve readability of binary-arch target
+    - stop special handling of the amd64 package, the module source already
+      cares for linking with the correct binary object file
+
+ -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:41:37 -0700
+
 nvidia-graphics-modules-i386 (190.53+1) unstable; urgency=high
 
   [ Russ Allbery ]

Modified: packages/nvidia-graphics-modules-i386/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules-i386/trunk/debian/rules?rev=813&op=diff
==============================================================================
--- packages/nvidia-graphics-modules-i386/trunk/debian/rules (original)
+++ packages/nvidia-graphics-modules-i386/trunk/debian/rules Sun Apr 25 03:43:37 2010
@@ -19,16 +19,17 @@
 # Customized by Randall Donald for nvidia-kernel-source
 # Further revisions by the Debian NVIDIA Maintainers.  See debian/changelog.
 
-# amd64 MUST be last in the flavours list.
 kernel   := 2.6.32-4
 flavours := 686 686-bigmem amd64
-revision := $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f2)
+package  := $(shell dpkg-parsechangelog | grep ^Source: | cut -d ' ' -f2)
 
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep:
 build-stamp:
 	tar jxf /usr/src/nvidia-kernel.tar.bz2
+	sed -i -e '/^Source:/s/.*/Source: $(package)/' modules/nvidia-kernel/debian/control.template
+	mv modules/nvidia-kernel/debian/changelog modules/nvidia-kernel/debian/changelog.nvidia-kernel-source.Debian
 	cp debian/changelog modules/nvidia-kernel/debian
 	touch $@
 
@@ -52,17 +53,18 @@
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-	cp control.template modules/nvidia-kernel/debian/
 	set -e; cd modules/nvidia-kernel; \
 	    for i in $(flavours); do \
-		if [ "$$i" = "amd64" ]; then \
-		    cp nv-kernel.o.x86_64 nv-kernel.o ; \
-		fi ;\
-		KERNEL_DEPENDS=y KSRC=/usr/src/linux-headers-$(kernel)-$$i \
-		    KVERS=$(kernel)-$$i KPKG_DEST_DIR=../.. \
+	        kernel=$(kernel)-$$i ; \
+		KSRC=/usr/src/linux-headers-$$kernel \
+		    KVERS=$$kernel \
+		    KERNEL_DEPENDS=y \
+		    KPKG_DEST_DIR=../.. \
 		    debian/rules binary_modules ; \
-		KSRC=/usr/src/linux-headers-$(kernel)-$$i \
-		    KVERS=$(kernel)-$$i HAVECONFIG=y debian/rules clean; \
+		KSRC=/usr/src/linux-headers-$$kernel \
+		    KVERS=$$kernel \
+		    HAVECONFIG=y \
+		    debian/rules clean; \
 	    done
 	for p in *.deb; do \
 	    dpkg-distaddfile $$p "non-free/kernel" optional; \