I pushed some patches to GIT. I don't expect problems but I'm still a newbie at GIT.
The patches merged OK, but tdebase now fails to build due to the docbook changes. I think you may have missed a variable somewhere?
Build log: http://quickbuild.pearsoncomputing.net:58080/2570488/buildlog_ubuntu-oneiric...
Tim