[pkg-nvidia-devel] r881 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog rules rules.defs

[rra at users.alioth.debian.org]

Author: rra
Date: Sat May  8 20:39:23 2010
New Revision: 881

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=881
Log:
Add the LEGACY variable and substvars for nvidia:Legacy

[ Andreas Beckmann ]
* debian/rules.defs, debian/rules: add variable/placeholder LEGACY
  and new subst vars nvidia:Legacy and nvidia:LegacyDesc

This is the first step towards sharing more build infrastructure with
the legacy packages.

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules
    packages/nvidia-graphics-drivers/trunk/debian/rules.defs

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=881&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sat May  8 20:39:23 2010
@@ -128,6 +128,8 @@
     uscan --report && dch -v <version> && debian/rules get-orig-source
   * fix-2.6.33-build.patch: remove, fixed by upstream in 195.36.24
   * libcuda1.symbols: update for symbol changes in 195.xx
+  * debian/rules.defs, debian/rules: add variable/placeholder LEGACY
+    and new subst vars nvidia:Legacy and nvidia:LegacyDesc
 
  -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:35:20 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=881&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sat May  8 20:39:23 2010
@@ -7,6 +7,7 @@
 
 include debian/rules.defs
 version			 = $(NVIDIA_RELEASE)
+legacy			 = $(NVIDIA_LEGACY)
 url_x86			 = $(NVIDIA_URL_X86)
 url_x86_64		 = $(NVIDIA_URL_X86_64)
 filename_x86		 = $(NVIDIA_FILENAME_X86)
@@ -120,7 +121,8 @@
 	dh_bugfiles -A
 
 override_dh_gencontrol:
-	dh_gencontrol -- -V'nvidia:Version=$(version)'
+	dh_gencontrol -- -V'nvidia:Version=$(version)' -V'nvidia:Legacy=$(legacy)' \
+		-V'nvidia:LegacyDesc=$(if $(legacy), ($(subst -legacy-,,$(legacy)) legacy version))'
 
 # Do not run dh_strip here.  The NVIDIA license says:
 #
@@ -141,6 +143,7 @@
 %:	%.in debian/rules.defs
 	perl -p \
 	-e 's{#VERSION#}{$(version)}g;' \
+	-e 's{#LEGACY#}{$(legacy)}g;' \
 	-e 's{#URL_X86#}{$(url_x86)}g;' \
 	-e 's{#URL_X86_64#}{$(url_x86_64)}g;' \
 	< $< > $@

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules.defs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules.defs?rev=881&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules.defs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules.defs Sat May  8 20:39:23 2010
@@ -1,5 +1,6 @@
 
 NVIDIA_RELEASE		 = 195.36.24
+NVIDIA_LEGACY		 =
 
 NVIDIA_DIRNAME_X86	 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}-pkg0
 NVIDIA_DIRNAME_X86_64	 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}-pkg2