Comment 49 for bug 219630

Steve, I have kept the diff as small as humanely possible. This being said, fixing both packaging issues and hardware issues within the scope of the same SRU has not been easy. My apologies if it's still too big to fit the constraints of an SRU.

One important thing to keep in mind is to avoid PCI ID conflicts in X.org at all cost. Right now, we have some in 8.04.0 and they prevent LTSP from operating normally with any Geode hardware covered by any of those 3 drivers. Given this, waiting until until 8.04.2 to fix this is out of the question.

Instead, we need to find a compromise that is mutually acceptable to everyone, to get this into 8.04.1 now, especially given how we need to get all 3 changes in at the same time, because of versioned Conflicts present in 2 of the 3 packages (xserver-xorg-video-all, xserver-xorg-video-geode, xserver-video-nsc) I proposed for this SRU.

I suppose that I could revert the Debian build system changes made by Brice Goglin, but I feel uneasy doing so, because the Debian XSF scripts are a real mess that I simply cannot work with. I'll instead trust that Brice made his changes right and accept them verbatim, minus one small change to make this build on Hardy dependencies.

I welcome your thoughts on any last- minute change that the Ubuntu X team or myself could implement to make this more acceptable for this SRU.

As for hardware testing, I have only access to hardware covered by NSC and GEODE drivers. The above fix restores the operation on those. I unfortunately don't have access to CYRIX hardware.