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
Hmmm....now I'm getting
[ 1%] Generating index.cache.bz2 cd /TEMP/tdebase-trinity-14.0.0/obj-i686-linux-gnu/doc/kxkb && /opt/trinity/bin/meinproc --check --cache index.cache.bz2 /TEMP/tdebase-trinity-14.0.0/doc/kxkb/index.docbook index.docbook:58: parser error : Entity 'tde' not defined <para>&kxkb; is the &tde; keyboard layout switching utility. ^ make[3]: *** [doc/kxkb/index.cache.bz2] Error 1 make[3]: Leaving directory `/TEMP/tdebase-trinity-14.0.0/obj-i686-linux-gnu'
Tim
Never mind...tdelibs needed to be rebuilt first.
Tim