[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Kalman "" Szalai]

 patches/dev300/premium-splitted-language-packages.diff |    2 +-
 patches/dev300/scp2_extensions_templates.diff          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 91da59b40022159e4ae4cd9ac0a8b10b055d25ea
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Mon Feb 1 11:26:11 2010 +0100

    Fix a bug introduced by multi language extension installer for LightProof.
    
    The module name of language dependent sct file (template) cannot be same as
    the name of group in it.
    
    * patches/dev300/premium-splitted-language-packages.diff:
    * patches/dev300/scp2_extensions_templates.diff:

diff --git a/patches/dev300/premium-splitted-language-packages.diff b/patches/dev300/premium-splitted-language-packages.diff
index e5de112..c9f6ccf 100644
--- a/patches/dev300/premium-splitted-language-packages.diff
+++ b/patches/dev300/premium-splitted-language-packages.diff
@@ -22,7 +22,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_LightProof"
++module = "gid_Module_Optional_Extensions_LightProof_M"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-lightproof-%LANGUAGESTRING"
 +solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
diff --git a/patches/dev300/scp2_extensions_templates.diff b/patches/dev300/scp2_extensions_templates.diff
index dc13d9a..da62ac6 100644
--- a/patches/dev300/scp2_extensions_templates.diff
+++ b/patches/dev300/scp2_extensions_templates.diff
@@ -106,7 +106,7 @@ diff -Naur scp2.old/source/templates/module_langpack_extensions_templates.sct sc
 +    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
 +End
 +
-+Module gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>
++Module gid_Module_Optional_Extensions_LightProof_M_<LANGUAGE_>
 +    ParentID = gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>;
 +    Sortkey = "50";
 +    Language = "<LANGUAGE>";