diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-19 12:22:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-19 12:23:01 +0200 |
| commit | 0a158b7800221ce8b79dac430015c6a02ad33e31 (patch) | |
| tree | 3bd224bdeb065dbfb5899903175db80605ae1157 /scp2 | |
| parent | WaE: comparison is always true due to limited range of data type (diff) | |
| download | core-0a158b7800221ce8b79dac430015c6a02ad33e31.tar.gz core-0a158b7800221ce8b79dac430015c6a02ad33e31.zip | |
Undo basis/brand split: merge basis program/resource/ into brand program/resource/.
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/inc/macros.inc | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 1b8f2a77df7d..8120b125d3d0 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -190,14 +190,6 @@ Styles = (PACKED); \ End -#define BRAND_RES_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - RESFILE_ALL_LANG(name); \ - Dir = gid_Brand_Dir_Program_Resource; \ - Styles = (PACKED); \ - End - #define STD_RES_FILE_PATCH(id,name) \ File id \ TXT_FILE_BODY; \ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 52611adc1a2a..c9aae2b85696 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -120,7 +120,6 @@ Module gid_Module_Langpack_Brand_Template InstallOrder = "1050"; Dirs = (gid_Brand_Dir_Program, gid_Brand_Dir_Program_Shell, - gid_Brand_Dir_Program_Resource, gid_Brand_Dir_Readme); Files = (gid_Brand_File_Res_Iso, gid_Brand_File_Res_Ooo, @@ -147,11 +146,6 @@ Directory gid_Brand_Dir_Program #endif End -Directory gid_Brand_Dir_Program_Resource - ParentID = gid_Brand_Dir_Program; - DosName = "resource"; -End - Directory gid_Brand_Dir_Program_Shell ParentID = gid_Brand_Dir_Program; DosName = "shell"; diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 836e79ac168d..015c1dc97241 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -142,7 +142,7 @@ Directory gid_Dir_Filter End Directory gid_Dir_Resource - ParentID = gid_Dir_Program; + ParentID = gid_Brand_Dir_Program; DosName = "resource"; End |