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

rra at users.alioth.debian.org rra at users.alioth.debian.org
Wed Apr 7 06:06:13 UTC 2010


Author: rra
Date: Wed Apr  7 06:06:10 2010
New Revision: 771

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=771
Log:
Stop generating debian/control and use substvars instead

* Stop generating debian/control and risking that the rules to do so may
  fire during a normal package build.  The only variable being
  substituted into the generated debian/control was the NVIDIA version,
  and that only in binary package stanzas.  Instead, generate an
  ${nvidia:Version} substvar with that value and use that substvar in
  debian/control.

Added:
    packages/nvidia-graphics-drivers/trunk/debian/control
      - copied, changed from r766, packages/nvidia-graphics-drivers/trunk/debian/control.in
Removed:
    packages/nvidia-graphics-drivers/trunk/debian/control.in
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=771&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Apr  7 06:06:10 2010
@@ -27,6 +27,12 @@
     comments in the postrm.  Thanks, Sven Joachim.  (Closes: #575272)
   * Stop stripping the binaries.  The NVIDIA license does not allow us to
     modify the binaries in any way.
+  * Stop generating debian/control and risking that the rules to do so may
+    fire during a normal package build.  The only variable being
+    substituted into the generated debian/control was the NVIDIA version,
+    and that only in binary package stanzas.  Instead, generate an
+    ${nvidia:Version} substvar with that value and use that substvar in
+    debian/control.
 
   [ Andreas Beckmann ]
   * Add Enhances: lib[32]vdpau1 to nvidia-vdpau-driver[-ia32].

Copied: packages/nvidia-graphics-drivers/trunk/debian/control (from r766, packages/nvidia-graphics-drivers/trunk/debian/control.in)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=771&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Wed Apr  7 06:06:10 2010
@@ -15,8 +15,8 @@
 Package: nvidia-glx-ia32
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-kernel-#VERSION#, ${shlibs:Depends}, ${misc:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
+Depends: nvidia-kernel-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: nvidia-settings, nvidia-kernel-source (>= ${nvidia:Version})
 Conflicts: nvidia-glx-src
 Replaces: nvidia-glx-src
 Description: NVIDIA binary driver 32bit libs
@@ -32,8 +32,8 @@
 
 Package: nvidia-glx
 Architecture: i386 amd64
-Depends: nvidia-kernel-#VERSION#, x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
+Depends: nvidia-kernel-${nvidia:Version}, x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}
+Suggests: nvidia-settings, nvidia-kernel-source (>= ${nvidia:Version})
 Conflicts: nvidia-glx-src, nvidia-glx-dev (<< 1.0.8774-5)
 Replaces: nvidia-glx-src
 Description: NVIDIA binary Xorg driver
@@ -67,10 +67,10 @@
 Section: non-free/libs
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-vdpau-driver-ia32 (>= #VERSION#),
+Depends: nvidia-vdpau-driver-ia32 (>= ${nvidia:Version}),
  ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-#VERSION#
-Suggests: nvidia-kernel-source (>= #VERSION#)
+Recommends: nvidia-kernel-${nvidia:Version}
+Suggests: nvidia-kernel-source (>= ${nvidia:Version})
 Replaces: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32
 Conflicts: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32
 Description: NVIDIA vdpau 32bit libraries
@@ -86,10 +86,10 @@
 Package: nvidia-libvdpau1
 Section: non-free/libs
 Architecture: i386 amd64
-Depends: nvidia-vdpau-driver (>= #VERSION#),
+Depends: nvidia-vdpau-driver (>= ${nvidia:Version}),
  ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-#VERSION#
-Suggests: nvidia-kernel-source (>= #VERSION#)
+Recommends: nvidia-kernel-${nvidia:Version}
+Suggests: nvidia-kernel-source (>= ${nvidia:Version})
 Replaces: nvidia-glx (<< 180.51), nvidia-libvdpau
 Conflicts: nvidia-glx (<< 180.51), nvidia-libvdpau
 Description: NVIDIA vdpau libraries
@@ -107,9 +107,9 @@
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libvdpau1 | nvidia-libvdpau1
-Recommends: nvidia-kernel-#VERSION#
+Recommends: nvidia-kernel-${nvidia:Version}
 Enhances: libvdpau1
-Suggests: nvidia-kernel-source (>= #VERSION#)
+Suggests: nvidia-kernel-source (>= ${nvidia:Version})
 Replaces: nvidia-glx (<< 180.51), nvidia-libvdpau, nvidia-libvdpau1-driver
 Conflicts: nvidia-glx (<< 180.51), nvidia-libvdpau,
  nvidia-libvdpau1 (<< 190.42-3), nvidia-libvdpau1-driver
@@ -130,9 +130,9 @@
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends},
  lib32vdpau1 | nvidia-libvdpau1-ia32
-Recommends: nvidia-kernel-#VERSION#
+Recommends: nvidia-kernel-${nvidia:Version}
 Enhances: lib32vdpau1
-Suggests: nvidia-kernel-source (>= #VERSION#)
+Suggests: nvidia-kernel-source (>= ${nvidia:Version})
 Replaces: nvidia-glx (<< 180.51), nvidia-libvdpau, nvidia-libvdpau1-driver-ia32
 Conflicts: nvidia-glx (<< 180.51), nvidia-libvdpau,
  nvidia-libvdpau1 (<< 190.42-3), nvidia-libvdpau1-driver-ia32
@@ -165,7 +165,7 @@
 Section: non-free/kernel
 Architecture: i386 amd64
 Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), quilt (>= 0.46-7~), ${misc:Depends}
-Recommends: nvidia-glx (>= #VERSION#), kernel-package (>= 8.082), module-assistant, devscripts
+Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), module-assistant, devscripts
 Conflicts: nvidia-kernel-src
 Replaces: nvidia-kernel-src
 Description: NVIDIA binary kernel module source
@@ -181,8 +181,8 @@
 Section: non-free/libs
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-#VERSION#
-Suggests: nvidia-kernel-source (>= #VERSION#)
+Recommends: nvidia-kernel-${nvidia:Version}
+Suggests: nvidia-kernel-source (>= ${nvidia:Version})
 Replaces: nvidia-glx (<< 185.18.14-2), nvidia-glx-dev (<< 185.18.14-2)
 Homepage: http://www.nvidia.com/CUDA
 Description: NVIDIA CUDA runtime library
@@ -203,8 +203,8 @@
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-#VERSION#
-Suggests: nvidia-kernel-source (>= #VERSION#)
+Recommends: nvidia-kernel-${nvidia:Version}
+Suggests: nvidia-kernel-source (>= ${nvidia:Version})
 Replaces: nvidia-glx-ia32 (<< 185.18.14-2)
 Homepage: http://www.nvidia.com/CUDA
 Description: NVIDIA CUDA runtime library (32-bit)

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=771&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Wed Apr  7 06:06:10 2010
@@ -28,7 +28,7 @@
 dirname_x86_64:=$(shell sh debian/upstream_info DIRNAME_X86_64)
 
 AUTOGEN		 = $(AUTOKEEP) $(AUTOCLEAN)
-AUTOKEEP	 = debian/control debian/copyright
+AUTOKEEP	 = debian/copyright
 AUTOCLEAN	 = \
 debian/nvidia-kernel-source.README.Debian \
 debian/nvidia-glx.links \
@@ -306,6 +306,7 @@
 	dh_makeshlibs -s
 	dh_installdeb
 	dh_shlibdeps
+	echo 'nvidia:Version=$(version)' >> debian/substvars
 	dh_gencontrol -s
 	dh_md5sums
 	dh_builddeb -s




More information about the Pkg-nvidia-devel mailing list