HiI'm in the process to add conflicts/replaces to the drivers (ack'd by David), so that they can be synced to Ubuntu. They used to be called x-x-driver-*, and when the modular X hit Debian the naming was changed.
Previously they have been merged manually, and this should make it easier to use the effort where it matters more (=the harder stuff).
t