Is a patched kernel going to be included to fix the CPU speed bug when charging?
the .deb package format has tons of "features" to address this sort of thing -- dpkg-divert, update-alternatives, etc. It is probably worth using them.