[pkg-nvidia-devel] r1309 - in /packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian: changelog control.in rules

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

Author: anbe-guest
Date: Tue Jul  6 00:12:32 2010
New Revision: 1309

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1309
Log:
use substvars instead of placeholder substitution

Modified:
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control.in
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog?rev=1309&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog Tue Jul  6 00:12:32 2010
@@ -3,6 +3,7 @@
   [ Andreas Beckmann ]
   * add missing Build-Depends: libxext6, fixes FTBFS
   * do not keep generated control files in the repository
+  * debian/control: use substvars instead of placeholder substitution
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 06 Jul 2010 01:30:44 +0200
 

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control.in?rev=1309&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control.in Tue Jul  6 00:12:32 2010
@@ -10,8 +10,8 @@
 
 Package: nvidia-glx-legacy-71xx-ia32
 Architecture: amd64
-Depends: libc6, nvidia-kernel-legacy-71xx-#VERSION#, ia32-libs, ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-legacy-71xx-source (>= #VERSION#)
+Depends: libc6, nvidia-kernel-legacy-71xx-${nvidia:Version}, ia32-libs, ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-legacy-71xx-source (>= ${nvidia:Version})
 Conflicts: nvidia-glx-src, nvidia-glx-ia32
 Replaces: nvidia-glx-src, nvidia-glx-legacy-ia32, nvidia-glx-legacy-96xx-ia32
 Description: NVIDIA binary Xorg driver (71xx legacy version)
@@ -24,8 +24,8 @@
 
 Package: nvidia-glx-legacy-71xx
 Architecture: i386 amd64
-Depends: nvidia-kernel-legacy-71xx-#VERSION#, x11-common, libc6 (>= 2.6.1-1), ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-legacy-71xx-source (>= #VERSION#)
+Depends: nvidia-kernel-legacy-71xx-${nvidia:Version}, x11-common, libc6 (>= 2.6.1-1), ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-legacy-71xx-source (>= ${nvidia:Version})
 Provides: xserver-xorg-video-2
 Conflicts: nvidia-glx-src, nvidia-glx, nvidia-glx-legacy, nvidia-glx-legacy-96xx
 Replaces: nvidia-glx-src, nvidia-glx-legacy
@@ -48,7 +48,7 @@
 Conflicts: nvidia-glx-dev, nvidia-glx-legacy, nvidia-glx-legacy-96xx, libgl-dev, mesa-common-dev, x11proto-gl-dev
 Replaces: libgl-dev, nvidia-glx-legacy
 Provides: libgl-dev
-Depends: nvidia-glx-legacy-71xx (>= #VERSION#)
+Depends: nvidia-glx-legacy-71xx (>= ${nvidia:Version})
 Description: NVIDIA binary Xorg driver development files
  This package contains the NVIDIA binary Xorg driver
  development files.
@@ -59,7 +59,7 @@
 Package: nvidia-kernel-legacy-71xx-source
 Architecture: i386 amd64
 Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
-Recommends: nvidia-glx-legacy-71xx (>= #VERSION#), kernel-package (>= 8.082), devscripts
+Recommends: nvidia-glx-legacy-71xx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts
 Conflicts: nvidia-kernel-src, nvidia-kernel-legacy-source
 Replaces: nvidia-kernel-src, nvidia-kernel-legacy-source
 Description: NVIDIA binary kernel module source (71xx legacy version)

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/rules?rev=1309&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/rules Tue Jul  6 00:12:32 2010
@@ -227,7 +227,7 @@
 	dh_shlibdeps  -Xia32 -Xtls -l$(CURDIR)/debian/nvidia-glx-legacy-71xx/usr/lib
 	# quickhack! remove me :-/
 	perl -pi.bak -e 's/,\s+nvidia-glx-legacy-71xx-ia32//;' $(CURDIR)/debian/nvidia-glx-legacy-71xx.substvars
-	dh_gencontrol -s
+	dh_gencontrol -s -- -V'nvidia:Version=$(version)'
 	dh_md5sums
 	dh_builddeb -s