Index: debian/control =================================================================== --- debian/control (.../anbe-308-simplify-rules) (revision 2434) +++ debian/control (.../anbe-309-legacy-support-5-control) (revision 2434) @@ -15,43 +15,44 @@ Package: nvidia-glx Architecture: i386 amd64 -Depends: nvidia-kernel-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends} +Depends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends} Suggests: nvidia-settings, - nvidia-kernel-source (>= ${nvidia:Version}) - | nvidia-kernel-dkms (>= ${nvidia:Version}) + nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version}) + | 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 or nvidia-kernel-dkms packages for - building the kernel module required by this package. This will provide - nvidia-kernel-${nvidia:Version}. + Please see the nvidia-kernel${nvidia:Legacy}-dkms or + nvidia-kernel${nvidia:Legacy}-source packages + for building the kernel module required by this package. + 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} +Depends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends} Suggests: nvidia-settings, - nvidia-kernel-source (>= ${nvidia:Version}) - | nvidia-kernel-dkms (>= ${nvidia:Version}) + nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version}) + | 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. @@ -60,19 +61,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. . @@ -83,16 +84,17 @@ Section: non-free/kernel Architecture: i386 amd64 Depends: ${misc:Depends}, dkms, nvidia-kernel-common -Recommends: nvidia-glx (>= ${nvidia:Version}) -Provides: nvidia-kernel-${nvidia:Version} +Recommends: nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}) +Provides: nvidia-kernel${nvidia:Legacy}-${nvidia:Version} Conflicts: nvidia-kernel-legacy-71xx-dkms, nvidia-kernel-legacy-96xx-dkms, nvidia-kernel-legacy-173xx-dkms, -Description: NVIDIA binary kernel module DKMS source +Description: NVIDIA binary kernel module DKMS source${nvidia:LegacyDesc} This package builds the NVIDIA Xorg binary kernel module needed by - nvidia-glx, using DKMS. The kernel module will be built for your running - kernel and automatically rebuilt for any new kernels that are installed. + nvidia-glx${nvidia:Legacy}, using DKMS. + The kernel module will be built for your running kernel and automatically + rebuilt for any driver versions or new kernels that are installed. . The NVIDIA binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server for graphics cards @@ -108,11 +110,11 @@ Architecture: i386 amd64 Depends: ${misc:Depends}, debhelper (>= 7.2.3~), make, quilt (>= 0.46-7~) Recommends: module-assistant | kernel-package, - nvidia-glx (>= ${nvidia:Version}), nvidia-kernel-common -Description: NVIDIA binary kernel module source + nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}), nvidia-kernel-common +Description: NVIDIA binary kernel module source${nvidia:LegacyDesc} This package provides the source for the NVIDIA Xorg binary kernel module - needed by nvidia-glx in a form suitable for use by module-assistant or - kernel-package. + needed by nvidia-glx${nvidia:Legacy} in a form suitable + for use by module-assistant or kernel-package. . The NVIDIA binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server for graphics cards @@ -123,19 +125,19 @@ plus complimentary Quadros and nforce. Look at the legacy packages for older cards. . - PLEASE read /usr/share/doc/nvidia-kernel-source/README.Debian.gz for - building information. If you want the kernel module to be automatically - installed via DKMS, install nvidia-kernel-dkms instead. + PLEASE read /usr/share/doc/nvidia-kernel${nvidia:Legacy}-source/README.Debian.gz + for building information. If you want the kernel module to be automatically + installed via DKMS, install nvidia-kernel${nvidia:Legacy}-dkms instead. Package: nvidia-libvdpau1 Section: non-free/libs Architecture: i386 amd64 Depends: nvidia-vdpau-driver (>= ${nvidia:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: nvidia-kernel-${nvidia:Version} +Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version} Suggests: - nvidia-kernel-source (>= ${nvidia:Version}) - | nvidia-kernel-dkms (>= ${nvidia:Version}) + nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version}) + | 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 @@ -154,10 +156,10 @@ Pre-Depends: libc6-i386 (>= 2.9-18) Depends: nvidia-vdpau-driver-ia32 (>= ${nvidia:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: nvidia-kernel-${nvidia:Version} +Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version} Suggests: - nvidia-kernel-source (>= ${nvidia:Version}) - | nvidia-kernel-dkms (>= ${nvidia:Version}) + nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version}) + | 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, @@ -191,11 +193,11 @@ 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}) - | nvidia-kernel-dkms (>= ${nvidia:Version}) + nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version}) + | 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 @@ -210,17 +212,22 @@ . See /usr/share/doc/nvidia-vdpau-driver/README.txt.gz for more information. + . + Please see the nvidia-kernel${nvidia:Legacy}-dkms or + nvidia-kernel${nvidia:Legacy}-source packages + for building the kernel module required by this package. + This will provide nvidia-kernel${nvidia:Legacy}-${nvidia:Version}. Package: nvidia-vdpau-driver-ia32 Section: non-free/libs 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}) - | nvidia-kernel-dkms (>= ${nvidia:Version}) + nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version}) + | 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, @@ -236,15 +243,20 @@ . See /usr/share/doc/nvidia-vdpau-driver-ia32/README.txt.gz for more information. + . + Please see the nvidia-kernel${nvidia:Legacy}-dkms or + nvidia-kernel${nvidia:Legacy}-source packages + for building the kernel module required by this package. + This will provide nvidia-kernel${nvidia:Legacy}-${nvidia:Version}. Package: libcuda1 Section: non-free/libs Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: nvidia-kernel-${nvidia:Version} +Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version} Suggests: - nvidia-kernel-source (>= ${nvidia:Version}) - | nvidia-kernel-dkms (>= ${nvidia:Version}) + nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version}) + | 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 @@ -257,19 +269,20 @@ 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}-dkms or + nvidia-kernel${nvidia:Legacy}-source packages 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} +Recommends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version} Suggests: - nvidia-kernel-source (>= ${nvidia:Version}) - | nvidia-kernel-dkms (>= ${nvidia:Version}) + nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version}) + | 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) @@ -282,9 +295,10 @@ 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}-dkms or + nvidia-kernel${nvidia:Legacy}-source packages 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-308-simplify-rules) (revision 2434) +++ debian/changelog (.../anbe-309-legacy-support-5-control) (revision 2434) @@ -138,6 +138,7 @@ else, drop some very outdated information * debian/rules.defs, debian/rules: add variable/placeholder LEGACY and new subst vars nvidia:Legacy and nvidia:LegacyDesc + * debian/control: use new nvidia:Legacy and nvidia:LegacyDesc substvars -- Russ Allbery Sat, 24 Apr 2010 20:35:20 -0700