Background: Historically, the BrOffice branding was done a different way - instead of using a runtime check and using the right branding based on that, there were completely distinct installation sets. To save the size a bit, the installation was split into 'brand' layer (that was supposed to contain the according branding), 'basis' layer (that contained the shared parts), and 'ure' layer (containing the UNO Runtime Environment). It might still make some sense to have a distinctive place for the URE, but definitely the 'basis' and 'brand' layer should be merged into one (preferably to the 'brand' layer.)

First part of the task has to be done in scp2, where you have to search for things like gid_Brand_Dir_Program, gid_Dir_Program, and similar, and merge the usage into one. Then we need to get rid of the rest of the basis and brand rpath; so search for the makefile.mk's that contain things like APP1RPATH = BRAND, and merge them into one too.

Skills: Building, scripting