[pkg-nvidia-devel] r1186 - in /packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian: control.in rules

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

Author: anbe-guest
Date: Mon Jun 28 00:02:59 2010
New Revision: 1186

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

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

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in?rev=1186&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control.in Mon Jun 28 00:02:59 2010
@@ -9,9 +9,9 @@
 
 Package: nvidia-glx-legacy-96xx-ia32
 Architecture: amd64
-Depends: nvidia-kernel-legacy-96xx-#VERSION#, ia32-libs, ${shlibs:Depends}
+Depends: nvidia-kernel-legacy-96xx-${nvidia:Version}, ia32-libs, ${shlibs:Depends}
 Pre-Depends: libc6-i386
-Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= #VERSION#)
+Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= ${nvidia:Version})
 Conflicts: nvidia-glx-src, nvidia-glx-ia32
 Replaces: nvidia-glx-src, nvidia-glx-legacy-ia32, nvidia-glx-legacy-71xx-ia32
 Description: NVIDIA binary Xorg driver (96xx legacy version)
@@ -24,8 +24,8 @@
 
 Package: nvidia-glx-legacy-96xx
 Architecture: i386 amd64
-Depends: nvidia-kernel-legacy-96xx-#VERSION#, x11-common (>= 7.3+2), ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= #VERSION#)
+Depends: nvidia-kernel-legacy-96xx-${nvidia:Version}, x11-common (>= 7.3+2), ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-legacy-96xx-source (>= ${nvidia:Version})
 Conflicts: nvidia-glx-src, nvidia-glx-legacy-dev, nvidia-glx-legacy-71xx, nvidia-glx
 Replaces: nvidia-glx-src, nvidia-glx-legacy
 Description: NVIDIA binary Xorg driver (96xx legacy version)
@@ -53,9 +53,9 @@
  
 Package: nvidia-glx-legacy-96xx-dev
 Architecture: i386 amd64
-Depends: nvidia-glx-legacy-96xx (>= #VERSION#)
+Depends: nvidia-glx-legacy-96xx (>= ${nvidia:Version})
 Provides: libgl-dev
-Conflicts: nvidia-glx-legacy-96xx (>= #NEXTVER#), libgl-dev, mesa-common-dev, nvidia-glx-legacy-71xx-dev, nvidia-glx-dev
+Conflicts: nvidia-glx-legacy-96xx (>= ${nvidia:Version}.0), libgl-dev, mesa-common-dev, nvidia-glx-legacy-71xx-dev, nvidia-glx-dev
 Replaces: libgl-dev, nvidia-glx-legacy
 Description: NVIDIA Xorg driver development files (96xx legacy version)
  This package contains the NVIDIA binary Xorg driver
@@ -67,7 +67,7 @@
 Package: nvidia-kernel-legacy-96xx-source
 Architecture: i386 amd64
 Depends: debhelper (>> 4.0.0), make, sed (>> 3.0)
-Recommends: nvidia-glx-legacy-96xx (>= #VERSION#), kernel-package (>= 8.082), devscripts
+Recommends: nvidia-glx-legacy-96xx (>= ${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 (96xx legacy version)

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules?rev=1186&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules Mon Jun 28 00:02:59 2010
@@ -270,7 +270,7 @@
 	dh_shlibdeps  -Xia32 -Xtls -l$(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
 	# quickhack! remove me :-/
 	perl -pi.bak -e 's/,\s+nvidia-glx$(LEGACY)-ia32//;' $(CURDIR)/debian/nvidia-glx$(LEGACY).substvars
-	dh_gencontrol -s
+	dh_gencontrol -s -- -V'nvidia:Version=$(version)'
 	dh_md5sums
 	dh_builddeb -s