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

[Kalman "" Szalai]

 scp2/source/extensions/directory_extensions.scp |   15 +++++++++++++++
 scp2/source/extensions/file_extensions.scp      |   12 ++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 51d3cf5b0dca1896087e586e5350e5f28a2ecc43
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Mon Dec 20 12:45:48 2010 +0100

    Remove extensions' filename version during unpack

diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 519213d..7b5d984 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -139,7 +139,7 @@ File gid_File_Oxt_CT2N
 	TXT_FILE_BODY;
 	Styles = (PACKED, ARCHIVE);
 	Dir = gid_Brand_Dir_Share_Extensions_CT2N;
-	Name = "ConvertTextToNumber-1.3.2.oxt";
+	Name = "ConvertTextToNumber.oxt";
 End
 
 #endif
@@ -282,7 +282,7 @@ File gid_File_Oxt_OOoBlogger
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_OOoBlogger;
-    Name = "oooblogger-0.1.oxt";
+    Name = "oooblogger.oxt";
 End
 
 #endif
commit 22807f825ad30fa4ef5dfe809e5662d025819b04
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Mon Dec 20 12:30:14 2010 +0100

    Update SUN Template Pack extensions' packaing mechanism
    
    Install extracted extension files to separated and language dependent
    directory. This is the new way to include extensions to installation
    set.

diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index a9a6330..e73979e 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -241,4 +241,19 @@ End
 
 /* ** Sun Template Pack ** */
 
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+
+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 (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 (hu) = "Sun_ODF_Template_Pack_hu";
+End
+
 #endif
+
+#endif
+
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index c61a924..519213d 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -110,7 +110,7 @@ End
 
 File gid_File_Oxt_LightProof
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_Install;
     Name (hu) = "lightproof-hu-1.2.oxt";
     Name (en-US) = "lightproof-en-US-0.1.oxt";
@@ -293,15 +293,15 @@ End
 #ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
 
 File gid_File_Optional_Extensions_Sun_Template_Pack
-    Dir = gid_Brand_Dir_Share_Extensions_Install;
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
     Name (en-US) = "Sun_ODF_Template_Pack_en-US.oxt";
     Name (de) = "Sun_ODF_Template_Pack_de.oxt";
     Name (it) = "Sun_ODF_Template_Pack_it.oxt";
     Name (fr) = "Sun_ODF_Template_Pack_fr.oxt";
     Name (es) = "Sun_ODF_Template_Pack_es.oxt";
     Name (hu) = "Sun_ODF_Template_Pack_hu.oxt";
-   Styles = (PACKED);
-   UnixRights = 444;
 End
 
 #endif