Index: debian/control
===================================================================
--- debian/control	(.../anbe-283-close-bugs)	(revision 2256)
+++ debian/control	(.../anbe-285-legacy-support-3)	(revision 2256)
@@ -15,39 +15,39 @@
 
 Package: nvidia-glx
 Architecture: i386 amd64
-Depends: nvidia-kernel-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= ${nvidia:Version})
+Depends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: nvidia-settings, nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Breaks: xserver-xorg-core (<< 2:1.6)
 Conflicts:
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,
-Description: NVIDIA binary Xorg driver
+Description: NVIDIA binary Xorg driver${nvidia:LegacyDesc}
  These binary drivers provide optimized hardware acceleration of
  OpenGL applications via a direct-rendering X Server.
  AGP, PCIe, SLI, TV-out and flat panel displays are also supported.
  .
- Please see the nvidia-kernel-source package
+ Please see the nvidia-kernel${nvidia:Legacy}-source package
  for building the kernel module required by this package.
- This will provide nvidia-kernel-${nvidia:Version}.
+ This will provide nvidia-kernel${nvidia:Legacy}-${nvidia:Version}.
  .
  This version only supports GeForce 6xxx and higher of the Geforce GPUs
  plus complimentary Quadros and nforce. Look at the legacy packages
  for older cards.
  .
- See /usr/share/doc/nvidia-glx/README.txt.gz for a complete list
+ See /usr/share/doc/nvidia-glx${nvidia:Legacy}/README.txt.gz for a complete list
  of supported GPUs and PCIIDs.
 
 Package: nvidia-glx-ia32
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-kernel-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= ${nvidia:Version})
+Depends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: nvidia-settings, nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Conflicts:
  nvidia-glx-legacy-71xx-ia32,
  nvidia-glx-legacy-96xx-ia32,
  nvidia-glx-legacy-173xx-ia32,
-Description: NVIDIA binary driver 32bit libs
+Description: NVIDIA binary driver 32bit libs${nvidia:LegacyDesc}
  These binary drivers provide optimized hardware acceleration of
  OpenGL applications via a direct-rendering X Server.
  AGP, PCIe, SLI, TV-out and flat panel displays are also supported.
@@ -56,19 +56,19 @@
  plus complimentary Quadros and nforce. Look at the legacy packages
  for older cards.
  .
- See /usr/share/doc/nvidia-glx/README.txt.gz for a complete list
+ See /usr/share/doc/nvidia-glx${nvidia:Legacy}/README.txt.gz for a complete list
  of supported GPUs and PCIIDs.
 
 Package: nvidia-glx-dev
 Architecture: i386 amd64
-Depends: nvidia-glx (= ${binary:Version}), libx11-dev, ${misc:Depends}
+Depends: nvidia-glx${nvidia:Legacy} (= ${binary:Version}), libx11-dev, ${misc:Depends}
 Provides: libgl-dev
 Conflicts: libgl-dev, mesa-common-dev,
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,
 Replaces: libgl-dev
-Description: NVIDIA binary Xorg driver development files
+Description: NVIDIA binary Xorg driver development files${nvidia:LegacyDesc}
  This package contains the NVIDIA binary Xorg driver
  development files.
  .
@@ -80,15 +80,15 @@
 Architecture: i386 amd64
 Depends: debhelper (>= 7.2.3~), make, quilt (>= 0.46-7~),
  module-assistant, ${misc:Depends}
-Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package, devscripts
-Description: NVIDIA binary kernel module source
+Recommends: nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}), kernel-package, devscripts
+Description: NVIDIA binary kernel module source${nvidia:LegacyDesc}
  This package builds the NVIDIA Xorg binary kernel module
- needed by nvidia-glx.
+ needed by nvidia-glx${nvidia:Legacy}.
  The binary drivers provide optimized hardware acceleration of
  OpenGL applications via a direct-rendering X Server.
  AGP, PCIe, SLI, TV-out and flat panel displays are also supported.
  .
- PLEASE read /usr/share/doc/nvidia-kernel-source/README.Debian.gz for building
+ PLEASE read /usr/share/doc/nvidia-kernel${nvidia:Legacy}-source/README.Debian.gz for building
  information.
 
 Package: nvidia-libvdpau1
@@ -96,8 +96,8 @@
 Architecture: i386 amd64
 Depends: nvidia-vdpau-driver (>= ${nvidia:Version}),
  ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-${nvidia:Version}
-Suggests: nvidia-kernel-source (>= ${nvidia:Version})
+Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}
+Suggests: nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Replaces: nvidia-glx (<< 180.51), nvidia-libvdpau
 Conflicts: nvidia-glx (<< 180.51), nvidia-libvdpau
 Description: NVIDIA vdpau libraries
@@ -116,8 +116,8 @@
 Pre-Depends: libc6-i386 (>= 2.9-18)
 Depends: nvidia-vdpau-driver-ia32 (>= ${nvidia:Version}),
  ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-${nvidia:Version}
-Suggests: nvidia-kernel-source (>= ${nvidia:Version})
+Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}
+Suggests: nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Replaces: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32,
  nvidia-vdpau-driver-ia32 (<< 190.53-3)
 Conflicts: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32,
@@ -151,9 +151,9 @@
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libvdpau1 | nvidia-libvdpau1
-Recommends: nvidia-kernel-${nvidia:Version}
+Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}
 Enhances: libvdpau1
-Suggests: nvidia-kernel-source (>= ${nvidia:Version})
+Suggests: nvidia-kernel${nvidia:Legacy}-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
@@ -174,9 +174,9 @@
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends},
  lib32vdpau1 | nvidia-libvdpau1-ia32
-Recommends: nvidia-kernel-${nvidia:Version}
+Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}
 Enhances: lib32vdpau1
-Suggests: nvidia-kernel-source (>= ${nvidia:Version})
+Suggests: nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Replaces: nvidia-glx (<< 180.51), nvidia-libvdpau,
  nvidia-libvdpau1-driver-ia32, nvidia-libvdpau1-ia32 (<< 190.53-3)
 Conflicts: nvidia-glx (<< 180.51), nvidia-libvdpau,
@@ -197,8 +197,8 @@
 Section: non-free/libs
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-${nvidia:Version}
-Suggests: nvidia-kernel-source (>= ${nvidia:Version})
+Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}
+Suggests: nvidia-kernel${nvidia:Legacy}-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
@@ -211,17 +211,17 @@
  Supported NVIDIA devices include GPUs starting from GeForce 8 and Quadro FX
  series, as well as the Tesla computing processors.
  .
- Please see the nvidia-kernel-source package
+ Please see the nvidia-kernel${nvidia:Legacy}-source package
  for building the kernel module required by this package.
- This will provide nvidia-kernel-${nvidia:Version}.
+ This will provide nvidia-kernel${nvidia:Legacy}-${nvidia:Version}.
 
 Package: libcuda1-ia32
 Section: non-free/libs
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-${nvidia:Version}
-Suggests: nvidia-kernel-source (>= ${nvidia:Version})
+Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}
+Suggests: nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Replaces: nvidia-glx-ia32 (<< 185.18.14-2)
 Homepage: http://www.nvidia.com/CUDA
 Description: NVIDIA CUDA runtime library (32-bit)
@@ -234,9 +234,9 @@
  Supported NVIDIA devices include GPUs starting from GeForce 8 and Quadro FX
  series, as well as the Tesla computing processors.
  .
- Please see the nvidia-kernel-source package
+ Please see the nvidia-kernel${nvidia:Legacy}-source package
  for building the kernel module required by this package.
- This will provide nvidia-kernel-${nvidia:Version}.
+ This will provide nvidia-kernel${nvidia:Legacy}-${nvidia:Version}.
 
 Package: libcuda1-dev
 Section: non-free/libdevel
Index: debian/changelog
===================================================================
--- debian/changelog	(.../anbe-283-close-bugs)	(revision 2256)
+++ debian/changelog	(.../anbe-285-legacy-support-3)	(revision 2256)
@@ -114,6 +114,8 @@
     and new subst vars nvidia:Legacy and nvidia:LegacyDesc
   * debian/rules: add support for control file templates with the LEGACY
     placeholder in their name
+  * debian/nvidia-{glx,kernel}*: rename to debian/nvidia-{glx,kernel}-LEGACY*
+  * debian/control: use new nvidia:Legacy and nvidia:LegacyDesc substvars
 
  -- Russ Allbery <rra@debian.org>  Sat, 24 Apr 2010 20:35:20 -0700