Undo basis/brand split: move help/ from basis to brand.

officecfg/registry/data/org/openoffice/Office/Paths.xcu

@@ -126,8 +126,7 @@
 
         <node oor:name="Help" oor:op="fuse" oor:mandatory="true">
             <node oor:name="InternalPaths">
-                <!-- FIXME where should this go -->
-                <node oor:name="$(instpath)/basis-link/help" oor:op="fuse" />
+                <node oor:name="$(instpath)/help" oor:op="fuse" />
             </node>
         </node>
 

officecfg/registry/schema/org/openoffice/Office/Common.xcs

@@ -1660,8 +1660,7 @@
 						<author>ABI</author>
 						<desc>Specifies the path to the Office help files.</desc>
 					</info>
-                    <!-- FIXME where should this go -->
-                    <value>$(instpath)/basis-link/help</value>
+                    <value>$(instpath)/help</value>
 				</prop>
 				<prop oor:name="Linguistic" oor:type="xs:string">
 					<info>

scp2/source/ooo/common_brand.scp

@@ -167,20 +167,6 @@ Directory gid_Brand_Dir_Readme
     DosName = "readmes";
 End
 
-Directory gid_Brand_Dir_Help
-#if defined MACOSX
-    ParentID = gid_Dir_Bundle_Contents;
-#else
-    ParentID = gid_Dir_Brand_Root;
-#endif
-    DosName = "help";
-End
-
-Directory gid_Brand_Dir_Help_Isolanguage
-    ParentID = gid_Brand_Dir_Help;
-    DIR_ISOLANGUAGE_ALL_LANG;
-End
-
 Directory gid_Brand_Dir_Share
 #if defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;

scp2/source/ooo/directory_ooo.scp

@@ -1188,9 +1188,9 @@ End
 
 Directory gid_Dir_Help
 #if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
+    ParentID = gid_Dir_Bundle_Contents;
 #else
-    ParentID = gid_Dir_Ooo_Basis;
+    ParentID = gid_Dir_Brand_Root;
 #endif
     DosName = "help";
 End

scp2/source/ooo/module_help_template.scp

@@ -39,8 +39,6 @@ Module gid_Module_Helppack_Help_Template
              gid_File_Help_Simpress_Zip,
              gid_File_Help_Smath_Zip,
              gid_File_Help_Swriter_Zip);
-    Dirs = (gid_Brand_Dir_Help,
-            gid_Brand_Dir_Help_Isolanguage);
 End
 
 #include "allhelpmodules_root.inc"