[Libreoffice-commits] .: Branch 'libreoffice-3-3' - scp2/source

[David Tardon]

 scp2/source/extensions/directory_extensions.scp            |   18 ++++++++++---
 scp2/source/extensions/file_extensions.scp                 |    4 +-
 scp2/source/extensions/module_extensions.scp               |    1 
 scp2/source/extensions/module_extensions_lightproof.scp    |    3 --
 scp2/source/extensions/module_extensions_sun_templates.scp |    3 --
 5 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit a1fc860c638a072924fd7733b4c09769acfa8ca3
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Mon Dec 20 19:28:42 2010 +0100

    Update LightProof extensions' packing mechanism
    
    * Install extracted extension files to separated and language dependent
      directory. This is the new way to include extensions to installation
      set.
    
    * Update for Sun Template Pack packing
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 124be59..2d12668 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -96,6 +96,17 @@ End
 
 /* ** Lightproof ** */
 
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+Directory gid_Brand_Dir_Share_Extensions_LightProof
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName (en-US) = "lightproof-en-US-0.1";
+    DosName (hu) = "lightproof-hu-1.2";
+    DosName = "lightproof";
+End
+
+#endif
+
 /* ** Numbertext ** */
 
 #ifdef WITH_EXTENSION_NUMBERTEXT
@@ -245,12 +256,13 @@ End
 
 Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
     ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName (en-US)= "Sun_ODF_Template_Pack_en-US";
+    DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
     DosName (de) = "Sun_ODF_Template_Pack_de";
-    DosName (it) = "Sun_ODF_Template_Pack_it";
-    DosName (fr) = "Sun_ODF_Template_Pack_fr";
     DosName (es) = "Sun_ODF_Template_Pack_es";
+    DosName (fr) = "Sun_ODF_Template_Pack_fr";
     DosName (hu) = "Sun_ODF_Template_Pack_hu";
+    DosName (it) = "Sun_ODF_Template_Pack_it";
+    DosName = "Sun_ODF_Template_Pack";
 End
 
 #endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 7b5d984..55d1c7a 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -111,9 +111,9 @@ End
 File gid_File_Oxt_LightProof
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Install;
-    Name (hu) = "lightproof-hu-1.2.oxt";
+    Dir = gid_Brand_Dir_Share_Extensions_LightProof;
     Name (en-US) = "lightproof-en-US-0.1.oxt";
+    Name (hu) = "lightproof-hu-1.2.oxt";
 End
 
 #endif
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 7d9683b..b1c771c 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -133,6 +133,7 @@ Module gid_Module_Optional_Extensions_LightProof
     Default = YES;
     Styles = ( );
 End
+
 #endif
 
 /* ** Numbertext ** */
diff --git a/scp2/source/extensions/module_extensions_lightproof.scp b/scp2/source/extensions/module_extensions_lightproof.scp
index 7caa601..58aa59a 100644
--- a/scp2/source/extensions/module_extensions_lightproof.scp
+++ b/scp2/source/extensions/module_extensions_lightproof.scp
@@ -46,8 +46,7 @@ Module gid_Module_Optional_Extensions_LightProof_Template
     Name = "gid_Module_Optional_Extensions_LightProof_Template";
     Description = "gid_Module_Optional_Extensions_LightProof_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (
-        gid_File_Oxt_LightProof );
+    Files = ( gid_File_Oxt_LightProof );
     Minimal = NO;
     Default = YES;
 End
diff --git a/scp2/source/extensions/module_extensions_sun_templates.scp b/scp2/source/extensions/module_extensions_sun_templates.scp
index bd6fe0a..6e5897e 100644
--- a/scp2/source/extensions/module_extensions_sun_templates.scp
+++ b/scp2/source/extensions/module_extensions_sun_templates.scp
@@ -46,8 +46,7 @@ Module gid_Module_Optional_Extensions_Sun_T_Pack_Template
     Name = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
     Description = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (
-        gid_File_Optional_Extensions_Sun_Template_Pack );
+    Files = ( gid_File_Optional_Extensions_Sun_Template_Pack );
     Minimal = NO;
     Default = YES;
 End