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

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

Author: anbe-guest
Date: Sat May 29 15:24:43 2010
New Revision: 953

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=953
Log:
  * Use only NVIDIA_VERSION instead of NVIDIA_CURRENT and NVIDIA_NEXT.
  * Make the meta package dependency on a module package versioned and require
    NVIDIA_VERSION at least.

Modified:
    packages/nvidia-graphics-modules/trunk/debian/changelog
    packages/nvidia-graphics-modules/trunk/debian/control.flavor
    packages/nvidia-graphics-modules/trunk/debian/control.source
    packages/nvidia-graphics-modules/trunk/debian/rules
    packages/nvidia-graphics-modules/trunk/debian/rules.defs

Modified: packages/nvidia-graphics-modules/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/changelog?rev=953&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-modules/trunk/debian/changelog Sat May 29 15:24:43 2010
@@ -9,6 +9,9 @@
     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.
+  * Use only NVIDIA_VERSION instead of NVIDIA_CURRENT and NVIDIA_NEXT.
+  * Make the meta package dependency on a module package versioned and require
+    NVIDIA_VERSION at least.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Sat, 29 May 2010 15:41:11 +0200
 

Modified: packages/nvidia-graphics-modules/trunk/debian/control.flavor
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/control.flavor?rev=953&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/control.flavor (original)
+++ packages/nvidia-graphics-modules/trunk/debian/control.flavor Sat May 29 15:24:43 2010
@@ -1,7 +1,7 @@
 
 Package: nvidia-kernel-2.6-#FLAVOR#
 Architecture: #ARCH#
-Depends: ${misc:Depends}, nvidia-kernel-#KERNEL#-#FLAVOR#
+Depends: ${misc:Depends}, nvidia-kernel-#KERNEL#-#FLAVOR# (>= #NVIDIA_VERSION#)
 Description: NVIDIA kernel module for Linux 2.6 (#FLAVOR# flavor)
  This is a metapackage that will depend on the latest version of the
  NVIDIA kernel module for the Linux 2.6 kernel series (#FLAVOR# flavor).

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=953&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/control.source (original)
+++ packages/nvidia-graphics-modules/trunk/debian/control.source Sat May 29 15:24:43 2010
@@ -5,7 +5,7 @@
 Uploaders: Randall Donald <rdonald at debian.org>, Russ Allbery <rra at debian.org>
 Build-Depends: debhelper (>= 7), module-assistant,
  #LINUX_HEADERS#
- nvidia-kernel-source (>= #NVIDIA_CURRENT#), nvidia-kernel-source (<< #NVIDIA_NEXT#~~),
+ nvidia-kernel-source (>= #NVIDIA_VERSION#), nvidia-kernel-source (<< #NVIDIA_VERSION#.1~~),
 Standards-Version: 3.8.4
 Homepage: http://www.nvidia.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-modules

Modified: packages/nvidia-graphics-modules/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/rules?rev=953&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/rules (original)
+++ packages/nvidia-graphics-modules/trunk/debian/rules Sat May 29 15:24:43 2010
@@ -104,18 +104,18 @@
 # call with $1 = kernel version, $2 = flavor, $3 = arch
 define append-flavor-entries
 	sed \
-		-e 's/#KERNEL#/$1/' \
-		-e 's/#FLAVOR#/$2/' \
-		-e 's/#ARCH#/$3/' \
+		-e 's/#KERNEL#/$1/g' \
+		-e 's/#FLAVOR#/$2/g' \
+		-e 's/#ARCH#/$3/g' \
+		-e 's/#NVIDIA_VERSION#/$(NVIDIA_VERSION)/g' \
 		debian/control.flavor >> debian/control.tmp
 
 endef
 
 debian/control-real: $(CONTROL_FILES)
 	sed \
-		-e 's/#NVIDIA_CURRENT#/$(NVIDIA_CURRENT)/' \
-		-e 's/#NVIDIA_NEXT#/$(NVIDIA_NEXT)/' \
-		-e 's/#LINUX_HEADERS#/$(LINUX_HEADERS)/' \
+		-e 's/#NVIDIA_VERSION#/$(NVIDIA_VERSION)/g' \
+		-e 's/#LINUX_HEADERS#/$(LINUX_HEADERS)/g' \
 		debian/control.source > debian/control.tmp
 	$(foreach f,$(KERNEL_FLAVORS_both),$(call append-flavor-entries,$(KERNEL_VERSION),$(f),i386 amd64))
 	$(foreach f,$(KERNEL_FLAVORS_only_i386),$(call append-flavor-entries,$(KERNEL_VERSION),$(f),i386))

Modified: packages/nvidia-graphics-modules/trunk/debian/rules.defs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/rules.defs?rev=953&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/rules.defs (original)
+++ packages/nvidia-graphics-modules/trunk/debian/rules.defs Sat May 29 15:24:43 2010
@@ -1,6 +1,4 @@
-NVIDIA_CURRENT		 = 195.36.24
-NVIDIA_NEXT		 = 195.36.25
-
+NVIDIA_VERSION		 = 195.36.24
 KERNEL_VERSION		 = 2.6.32-5
 
 KERNEL_FLAVORS_i386	+= 486