The patches merged OK, but tdebase now fails to build due to the docbook changes. I think you may have missed a variable somewhere?
Darn! I was hoping I could push the fix before anybody noticed. I found the same failure about a half hour ago. :) The failure is caused by me renaming whatiskde.docbook to whatistde.docbook and forgetting to add the new file to GIT. I am testing right now and I'll merge shortly!
Quick fix: find whatiskde.docbook from 3.5.13 or GIT history, copy to tdebase/doc/khelpcenter, and rename to whatistde.docbook. The text won't be updated but will build.
Updated in GIT hash ad7a4fdcc5551ac857a3a22eed5df4830d524d66!
Darrell