David Prévot wrote:
>> _Description: Run "nvidia-installer --uninstall"?
>> The nvidia-installer program was found on this system. This is
>> + probably left over from an earlier installation of the non-free NVIDIA
>> + graphics driver, installed using the NVIDIA *.run file directly. This
>> installation is incompatible with the Debian packages. To install the
>> Debian packages safely, it is therefore necessary to undo the changes
>> performed by nvidia-installer.
>
> s/Nvidia/NVIDIA/g for consistency
I'm a sucker for consistency, but do we have any good reason for
standardising in the direction of shoutiness? Oh well, I think it's
already the majority spelling.
The only thing I've done to the templates is turn a doublespace into a
singlespace. Likewise in the long descriptions for nvidia-support and
nvidia-kernel-common. nvidia-installer-cleanup needs a bit more:
> Description: Cleanup after driver installation with the nvidia-installer
Lowercase "cleanup" (squeaking by as a noun-phrase-based synopsis).
> This package takes care that no old installation of the non-free NVIDIA
^^^^^^^^^^^^
> graphics drivers that was done with the nvidia-installer remains on the
> system. Such an installation conflicts with the packaged drivers.
^
I don't much like this use of "installation"; first it's talking about
the event (what "was done"), then it's talking about the resulting
state of the system (what "remains").
Stealing a term from one of the templates, I'd suggest:
This package ensures that no remnants of the non-free NVIDIA graphics
drivers that were installed with the nvidia-installer remain on the
system. Such an installation conflicts with the packaged drivers.
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
diff -ru nvidia-support-20120731+1.pristine/debian/control
nvidia-support-20120731+1/debian/control
--- nvidia-support-20120731+1.pristine/debian/control 2012-08-03
13:42:55.000000000 +0100
+++ nvidia-support-20120731+1/debian/control 2012-08-30 18:30:25.832411310
+0100
@@ -16,7 +16,7 @@
Depends: ${misc:Depends}
Description: NVIDIA binary graphics driver support files
This package contains support files needed for all current and legacy
- versions of the non-free NVIDIA graphics drivers. These include scripts
+ versions of the non-free NVIDIA graphics drivers. These include scripts
used for warning about a mismatching version of the kernel module or for
creating a minimal xorg.conf to enable the NVIDIA driver.
@@ -26,10 +26,10 @@
Depends: ${misc:Depends}
Conflicts: nvidia-common
Replaces: nvidia-common
-Description: Cleanup after driver installation with the nvidia-installer
- This package takes care that no old installation of the non-free NVIDIA
- graphics drivers that was done with the nvidia-installer remains on the
- system. Such an installation conflicts with the packaged drivers.
+Description: cleanup after driver installation with the nvidia-installer
+ This package ensures that no remnants of the non-free NVIDIA graphics
+ drivers that were installed with the nvidia-installer remain on the
+ system. Such an installation conflicts with the packaged drivers.
.
Furthermore using the nvidia-installer to install a new version of the
drivers is prevented as long as this package is installed.
@@ -44,7 +44,7 @@
${misc:Depends}
Description: NVIDIA binary kernel module support files
This package contains support files used for any version of the NVIDIA
- kernel module. It sets up udev and ConsoleKit rules, ensures the NVIDIA
+ kernel module. It sets up udev and ConsoleKit rules, ensures the NVIDIA
control device is created, associates the NVIDIA card with the correct
kernel module, and performs any other tasks required for the module to
work properly.
diff -ru
nvidia-support-20120731+1.pristine/debian/nvidia-installer-cleanup.templates
nvidia-support-20120731+1/debian/nvidia-installer-cleanup.templates
---
nvidia-support-20120731+1.pristine/debian/nvidia-installer-cleanup.templates
2012-08-03 13:39:04.000000000 +0100
+++ nvidia-support-20120731+1/debian/nvidia-installer-cleanup.templates
2012-08-30 18:30:38.268411246 +0100
@@ -3,8 +3,8 @@
Default: true
_Description: Run "nvidia-installer --uninstall"?
The nvidia-installer program was found on this system. This is
- probably left over from an earlier installation of the non-free Nvidia
- graphics driver, installed using the Nvidia *.run file directly. This
+ probably left over from an earlier installation of the non-free NVIDIA
+ graphics driver, installed using the NVIDIA *.run file directly. This
installation is incompatible with the Debian packages. To install the
Debian packages safely, it is therefore necessary to undo the changes
performed by nvidia-installer.
@@ -14,10 +14,10 @@
Default: true
_Description: Delete nvidia-installer files?
Some files from the nvidia-installer program still remain on this system.
- These probably come from an earlier installation of the non-free Nvidia
+ These probably come from an earlier installation of the non-free NVIDIA
graphics driver using the *.run file directly. Running the
uninstallation procedure may have failed and left these behind. These
- files conflict with the packages providing the non-free Nvidia graphics
+ files conflict with the packages providing the non-free NVIDIA graphics
driver and must be removed before the package installation can continue.
Template: nvidia-installer-cleanup/remove-conflicting-libraries
@@ -26,7 +26,7 @@
#flag:translate!:3
_Description: Remove conflicting library files?
The following libraries were found on this system and conflict with
- the current installation of the Nvidia graphics drivers:
+ the current installation of the NVIDIA graphics drivers:
.
${conflict-libs}
.
diff -ru nvidia-support-20120731+1.pristine/debian/nvidia-support.templates
nvidia-support-20120731+1/debian/nvidia-support.templates
--- nvidia-support-20120731+1.pristine/debian/nvidia-support.templates
2012-08-03 14:00:38.000000000 +0100
+++ nvidia-support-20120731+1/debian/nvidia-support.templates 2012-08-30
18:35:49.484411263 +0100
@@ -15,7 +15,7 @@
Template: nvidia-support/warn-mismatching-module-version
Type: error
_Description: Mismatching nvidia kernel module loaded
- The Nvidia driver that is being installed (version ${new-version})
+ The NVIDIA driver that is being installed (version ${new-version})
does not match the nvidia kernel module currently loaded
(version ${running-version}).
.
@@ -37,8 +37,8 @@
Template: nvidia-support/needs-xorg-conf-to-enable
Type: note
-_Description: Manual configuration required to enable Nvidia driver
- The Nvidia driver is not yet configured; it needs to be enabled in
+_Description: Manual configuration required to enable NVIDIA driver
+ The NVIDIA driver is not yet configured; it needs to be enabled in
xorg.conf before it can be used.
.
Please see the package documentation for instructions.
@@ -53,9 +53,9 @@
Template: nvidia-support/removed-but-enabled-in-xorg-conf
Type: error
#flag:translate!:3
-_Description: Nvidia driver is still enabled in xorg.conf
- The Nvidia driver was just removed, but it is still enabled in the
- Xorg configuration. X cannot be (re-)started successfully until Nvidia
+_Description: NVIDIA driver is still enabled in xorg.conf
+ The NVIDIA driver was just removed, but it is still enabled in the
+ Xorg configuration. X cannot be (re-)started successfully until NVIDIA
is disabled in the following config file(s):
.
${config-files}
@@ -63,7 +63,7 @@
Template: nvidia-support/create-nvidia-conf
Type: boolean
Default: true
-Description: Create a minimal Xorg configuration to enable NVIDIA?
+_Description: Create a minimal Xorg configuration to enable NVIDIA?
The NVIDIA Xorg driver that was just installed requires manual configuration
to be activated.
.
Source: nvidia-support
Section: contrib/misc
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-de...@lists.alioth.debian.org>
Uploaders: Russ Allbery <r...@debian.org>,
Andreas Beckmann <deb...@abeckmann.de>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 8.1.0~), po-debconf
Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/pkg-nvidia/packages/nvidia-support/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-support/
Package: nvidia-support
Architecture: amd64 i386
Multi-Arch: foreign
Depends: ${misc:Depends}
Description: NVIDIA binary graphics driver support files
This package contains support files needed for all current and legacy
versions of the non-free NVIDIA graphics drivers. These include scripts
used for warning about a mismatching version of the kernel module or for
creating a minimal xorg.conf to enable the NVIDIA driver.
Package: nvidia-installer-cleanup
Architecture: amd64 i386
Multi-Arch: foreign
Depends: ${misc:Depends}
Conflicts: nvidia-common
Replaces: nvidia-common
Description: cleanup after driver installation with the nvidia-installer
This package ensures that no remnants of the non-free NVIDIA graphics
drivers that were installed with the nvidia-installer remain on the
system. Such an installation conflicts with the packaged drivers.
.
Furthermore using the nvidia-installer to install a new version of the
drivers is prevented as long as this package is installed.
Package: nvidia-kernel-common
Section: contrib/kernel
Architecture: amd64 i386
Pre-Depends: ${misc:Pre-Depends}
Depends:
kmod | module-init-tools (<< 4),
glx-alternative-nvidia (>= 0.2.90),
${misc:Depends}
Description: NVIDIA binary kernel module support files
This package contains support files used for any version of the NVIDIA
kernel module. It sets up udev and ConsoleKit rules, ensures the NVIDIA
control device is created, associates the NVIDIA card with the correct
kernel module, and performs any other tasks required for the module to
work properly.
Template: nvidia-installer-cleanup/uninstall-nvidia-installer
Type: boolean
Default: true
_Description: Run "nvidia-installer --uninstall"?
The nvidia-installer program was found on this system. This is
probably left over from an earlier installation of the non-free NVIDIA
graphics driver, installed using the NVIDIA *.run file directly. This
installation is incompatible with the Debian packages. To install the
Debian packages safely, it is therefore necessary to undo the changes
performed by nvidia-installer.
Template: nvidia-installer-cleanup/delete-nvidia-installer
Type: boolean
Default: true
_Description: Delete nvidia-installer files?
Some files from the nvidia-installer program still remain on this system.
These probably come from an earlier installation of the non-free NVIDIA
graphics driver using the *.run file directly. Running the
uninstallation procedure may have failed and left these behind. These
files conflict with the packages providing the non-free NVIDIA graphics
driver and must be removed before the package installation can continue.
Template: nvidia-installer-cleanup/remove-conflicting-libraries
Type: boolean
Default: true
#flag:translate!:3
_Description: Remove conflicting library files?
The following libraries were found on this system and conflict with
the current installation of the NVIDIA graphics drivers:
.
${conflict-libs}
.
These libraries are most likely remnants of an old installation using the
nvidia-installer program and do not belong to any package managed by dpkg.
It should be safe to delete them.
Template: nvidia-support/check-running-module-version
Type: boolean
Default: true
Description: for internal use
Can be preseeded. If set to false, disables the nouveau module check
and nvidia module version check entirely.
Template: nvidia-support/last-mismatching-module-version
Type: string
Default: none
Description: for internal use
Remembers the last version for which we displayed the warning, so that we
warn only once for each version.
Template: nvidia-support/warn-mismatching-module-version
Type: error
_Description: Mismatching nvidia kernel module loaded
The NVIDIA driver that is being installed (version ${new-version})
does not match the nvidia kernel module currently loaded
(version ${running-version}).
.
The X server, OpenGL, and GPGPU applications may not work properly.
.
The easiest way to fix this is to reboot the machine once the
installation has finished. You can also stop the X server (usually by
stopping the login manager, e.g. gdm3, kdm, or xdm), manually unload the
module ("rmmod nvidia"), and restart the X server.
Template: nvidia-support/warn-nouveau-module-loaded
Type: error
_Description: Conflicting nouveau kernel module loaded
The free nouveau kernel module is currently loaded and conflicts with the
non-free nvidia kernel module.
.
The easiest way to fix this is to reboot the machine once the
installation has finished.
Template: nvidia-support/needs-xorg-conf-to-enable
Type: note
_Description: Manual configuration required to enable NVIDIA driver
The NVIDIA driver is not yet configured; it needs to be enabled in
xorg.conf before it can be used.
.
Please see the package documentation for instructions.
Template: nvidia-support/check-xorg-conf-on-removal
Type: boolean
Default: true
Description: for internal use
Can be preseeded. If set to false, does not warn about fglrx still being
enabled in xorg.conf(.d/) when removing the package.
Template: nvidia-support/removed-but-enabled-in-xorg-conf
Type: error
#flag:translate!:3
_Description: NVIDIA driver is still enabled in xorg.conf
The NVIDIA driver was just removed, but it is still enabled in the
Xorg configuration. X cannot be (re-)started successfully until NVIDIA
is disabled in the following config file(s):
.
${config-files}
Template: nvidia-support/create-nvidia-conf
Type: boolean
Default: true
_Description: Create a minimal Xorg configuration to enable NVIDIA?
The NVIDIA Xorg driver that was just installed requires manual configuration
to be activated.
.
A minimal config file that should be sufficient to start the X server
can be created now. This file (/etc/X11/nvidia.conf) can be customized
later if desired.
.
If you choose not to create this file now, you have to create your own
configuration (in /etc/X11/xorg.conf or better /etc/X11/xorg.conf.d/*.conf)
before Xorg can use the NVIDIA driver.
