[pkg-nvidia-devel] r958 - in /packages/nvidia-graphics-modules/trunk/debian: changelog control.source rules

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

Author: anbe-guest
Date: Sun May 30 10:30:22 2010
New Revision: 958

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=958
Log:
 * Embed the version numbers of nvidia-graphics-modules, nvidia-kernel-source
    (without duplicating the NVIDIA version) and linux-headers-* in the
    version of the binary module packages.
  * Drop Build-Depends: module-assistant.

Modified:
    packages/nvidia-graphics-modules/trunk/debian/changelog
    packages/nvidia-graphics-modules/trunk/debian/control.source
    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=958&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-modules/trunk/debian/changelog Sun May 30 10:30:22 2010
@@ -1,4 +1,7 @@
 nvidia-graphics-modules (195.36.24+0) UNRELEASED; urgency=low
+
+  * TODO BEFORE RELEASE: delete line with HAVECONFIG from debian/rules, no
+    longer neccessary with n-k-s 195.36.24-3; bump version; regenerate control
 
   [ Andreas Beckmann ]
   * Build for 2.6.32-5.
@@ -13,6 +16,10 @@
   * Make the meta package dependency on a module package versioned and require
     NVIDIA_VERSION at least.
   * Add support for building legacy modules.
+  * Embed the version numbers of nvidia-graphics-modules, nvidia-kernel-source
+    (without duplicating the NVIDIA version) and linux-headers-* in the
+    version of the binary module packages.
+  * Drop Build-Depends: module-assistant.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Sat, 29 May 2010 15:41:11 +0200
 

Modified: packages/nvidia-graphics-modules/trunk/debian/control.source
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/control.source?rev=958&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/control.source (original)
+++ packages/nvidia-graphics-modules/trunk/debian/control.source Sun May 30 10:30:22 2010
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>
-Build-Depends: debhelper (>= 7), module-assistant,
+Build-Depends: debhelper (>= 7),
  #LINUX_HEADERS#
  nvidia-kernel#LEGACY#-source (>= #NVIDIA_VERSION#), nvidia-kernel#LEGACY#-source (<< #NVIDIA_VERSION#.1~~),
 Standards-Version: 3.8.4

Modified: packages/nvidia-graphics-modules/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/rules?rev=958&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/rules (original)
+++ packages/nvidia-graphics-modules/trunk/debian/rules Sun May 30 10:30:22 2010
@@ -21,12 +21,17 @@
 
 include debian/rules.defs
 DEB_HOST_ARCH	:= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-package  := $(shell dpkg-parsechangelog | grep ^Source: | cut -d ' ' -f2)
+package		:= $(shell dpkg-parsechangelog | grep ^Source: | cut -d ' ' -f2)
 legacy		 = $(NVIDIA_LEGACY)
 
 KERNEL_FLAVORS_both		 = $(filter $(KERNEL_FLAVORS_i386),$(KERNEL_FLAVORS_amd64))
 KERNEL_FLAVORS_only_i386	 = $(filter-out $(KERNEL_FLAVORS_both),$(KERNEL_FLAVORS_i386))
 KERNEL_FLAVORS_only_amd64	 = $(filter-out $(KERNEL_FLAVORS_both),$(KERNEL_FLAVORS_amd64))
+
+# arg1 = package to query
+get_package_version		 = $(shell zcat /usr/share/doc/$1/changelog.Debian.gz | dpkg-parsechangelog -l- | grep ^Version: | cut -d ' ' -f2)
+
+nks_debian_revision		 = $(subst $(NVIDIA_VERSION)-,,$(call get_package_version,nvidia-kernel$(legacy)-source))
 
 build: build-arch build-indep
 build-arch: build-stamp
@@ -62,12 +67,12 @@
 .NOTPARALLEL:
 binary-module-%: build binary-arch-meta
 	set -e; cd modules/nvidia-kernel$(legacy); \
-		KSRC=/usr/src/linux-headers-$* \
+		KSRC=/lib/modules/$*/build \
 			KVERS=$* \
-			KERNEL_DEPENDS=y \
+			KDREV=$(nks_debian_revision)+$(call get_package_version,linux-headers-$*) \
 			KPKG_DEST_DIR=../.. \
 			debian/rules binary_modules ; \
-		KSRC=/usr/src/linux-headers-$* \
+		KSRC=/lib/modules/$*/build \
 			KVERS=$* \
 			HAVECONFIG=y \
 			debian/rules clean