problem with dpkg-divert installing nvidia-glx

[Paul S]

OK, I replaced the video card on my lappy from ATI to NVidia and am now 
trying to get the driver installed.

I tried using restricted manager.  It removed the ATI flgrx driver, then 
tried to install nvidia-glx, but that failed with the message:

Unpacking nvidia-glx (from 
.../nvidia-glx_1%3a1.0.9631+2.6.20.5-16.28_i386.deb) ...
dpkg-divert: `diversion of /usr/lib/libGL.so.1 to 
/usr/lib/nvidia/libGL.so.1.xlibmesa by nvidia-glx' clashes with 
`diversion of /usr/lib/libGL.so.1 to /usr/lib/fglrx/libGL.so.1.xlibmesa 
by xorg-driver-fglrx'
dpkg: error processing 
/var/cache/apt/archives/nvidia-glx_1%3a1.0.9631+2.6.20.5-16.28_i386.deb 
(--unpack):
  subprocess pre-installation script returned error exit status 2
Errors were encountered while processing:
  /var/cache/apt/archives/nvidia-glx_1%3a1.0.9631+2.6.20.5-16.28_i386.deb
E: Sub-process /usr/bin/dpkg returned an error code (1)

I have tried to manually use dpkg-divert to remove the block, but that 
fails too:

paul :~$ sudo dpkg-divert --list /usr/lib/libGL.so.1
diversion of /usr/lib/libGL.so.1 to /usr/lib/fglrx/libGL.so.1.xlibmesa 
by xorg-driver-fglrx
paul :~$ sudo dpkg-divert --rename --remove /usr/lib/libGL.so.1
Removing `diversion of /usr/lib/libGL.so.1 to 
/usr/lib/fglrx/libGL.so.1.xlibmesa by xorg-driver-fglrx'
dpkg-divert: rename involves overwriting `/usr/lib/libGL.so.1' with
   different file `/usr/lib/fglrx/libGL.so.1.xlibmesa', not allowed
paul :~$ sudo dpkg-divert --remove /usr/lib/libGL.so.1
Removing `diversion of /usr/lib/libGL.so.1 to 
/usr/lib/fglrx/libGL.so.1.xlibmesa by xorg-driver-fglrx'
dpkg-divert: rename involves overwriting `/usr/lib/libGL.so.1' with
   different file `/usr/lib/fglrx/libGL.so.1.xlibmesa', not allowed

I checked and all the fglrx packages are gone:
paul :~$ dpkg -l | grep fgl
paul :~$

I had been using the ATI current fglrx packages, not the 
linux-restricted-modules version, so the failure to remove the diversion 
may have been in the ATI fglrx package.  Anyway, the package is gone and 
that script is out of the picture for now.

I also tried reinstalling libgl1-mesa-glx and it did, but the diversion 
error still occurs when I try to install nvidia-glx.

paul :~$ apt-get install nvidia-glx
Reading package lists... Done
Building dependency tree
Reading state information... Done
Suggested packages:
   nvidia-kernel-source
The following NEW packages will be installed:
   nvidia-glx
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Need to get 0B/4492kB of archives.
After unpacking 13.7MB of additional disk space will be used.
WARNING: The following packages cannot be authenticated!
   nvidia-glx
Authentication warning overridden.
(Reading database ... 199626 files and directories currently installed.)
Unpacking nvidia-glx (from 
.../nvidia-glx_1%3a1.0.9631+2.6.20.5-16.28_i386.deb) ...
dpkg-divert: `diversion of /usr/lib/libGL.so.1 to 
/usr/lib/nvidia/libGL.so.1.xlibmesa by nvidia-glx' clashes with 
`diversion of /usr/lib/libGL.so.1 to /usr/lib/fglrx/libGL.so.1.xlibmesa 
by xorg-driver-fglrx'
dpkg: error processing 
/var/cache/apt/archives/nvidia-glx_1%3a1.0.9631+2.6.20.5-16.28_i386.deb 
(--unpack):
  subprocess pre-installation script returned error exit status 2
Errors were encountered while processing:
  /var/cache/apt/archives/nvidia-glx_1%3a1.0.9631+2.6.20.5-16.28_i386.deb
E: Sub-process /usr/bin/dpkg returned an error code (1)

paul :~$ sudo dpkg-divert --remove /usr/lib/libGL.so.1
Removing `diversion of /usr/lib/libGL.so.1 to 
/usr/lib/fglrx/libGL.so.1.xlibmesa by xorg-driver-fglrx'
dpkg-divert: rename involves overwriting `/usr/lib/libGL.so.1' with
   different file `/usr/lib/fglrx/libGL.so.1.xlibmesa', not allowed

Anyone have an idea how to fix this so I can get 3D going on my new NVidia?

TIA