I read in the news today that the release of X 4.4 will have a new license that requires an advertising clause. As a result, it seems likely that Debian will not be able to carry it.
Therefore it looks like this brouhaha will be quickly resolved by X 4.3 or a cvs fork of X 4.3.999 being the last version Debian packages until such a time as the alternative forks by Keith Packard, et al. are ready for deployment. So I'm thinking that this probably means there is no problem anymore about who did what, or who will be working on what. Simply because there will be no more versions of the regular XFree86 in Debian after 4.3 is uploaded. A non-Xfree86 package can also indicate a new maintainer.