[Libreoffice-commits] .: 5 commits - scp2/source
René Engelhard
rene at kemper.freedesktop.org
Sat Jan 1 17:15:00 PST 2011
scp2/source/extensions/directory_extensions.scp | 16 ++++++++++++++--
scp2/source/extensions/file_extensions.scp | 12 ++++++------
2 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit d96ca6b60fe74ce6732f3cd3da41ca6995f9c1a6
Merge: 9210aaf... 977dc85...
Author: Rene Engelhard <rene at debian.org>
Date: Sun Jan 2 01:15:14 2011 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
scp2/source/extensions/directory_extensions.scp
diff --cc scp2/source/extensions/directory_extensions.scp
index 9bbb779,124be59..4d84668
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@@ -241,21 -241,19 +241,33 @@@ En
/* ** 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
+/* script providers */
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "script-provider-for-beanshell";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "script-provider-for-javascript";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "script-provider-for-python";
+End
diff --cc scp2/source/extensions/file_extensions.scp
index 53f563a,7b5d984..85b31a8
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@@ -300,33 -302,8 +302,31 @@@ File gid_File_Optional_Extensions_Sun_T
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
+/* script providers */
+
+File gid_File_Oxt_Script_Provider_For_Beanshell
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
+ Name = "script-provider-for-beanshell.oxt";
+End
+
+File gid_File_Oxt_Script_Provider_For_Javascript
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
+ Name = "script-provider-for-javascript.oxt";
+End
+
+File gid_File_Oxt_Script_Provider_For_Python
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python;
+ Name = "script-provider-for-python.oxt";
+End
+
#endif
#endif
commit 977dc85bbd6f151946d73d4dc51d991846e17dcf
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Mon Dec 20 12:56:14 2010 +0100
Remove version info from extension folder name too.
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index e73979e..124be59 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -113,7 +113,7 @@ End
Directory gid_Brand_Dir_Share_Extensions_CT2N
ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "ConvertTextToNumber-1.3.2";
+ DosName = "ConvertTextToNumber";
End
#endif
@@ -234,7 +234,7 @@ End
Directory gid_Brand_Dir_Share_Extensions_OOoBlogger
ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "oooblogger-0.1";
+ DosName = "oooblogger";
End
#endif
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
commit c98624788583a1b56145a8bb16f17f53bb7c228f
Author: Andras Timar <timar at fsf.hu>
Date: Sun Dec 19 19:55:26 2010 +0100
typo fix in helppack.ulf
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
index 600a699..5183643 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -766,7 +766,7 @@ en-US = "Installs Konkani help in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_HELPPACK_KS]
en-US = "Kashmiri"
-[STR_DESC_MODULE_HELPPACK_KS
+[STR_DESC_MODULE_HELPPACK_KS]
en-US = "Installs Kashmiri help in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_HELPPACK_KY]
More information about the Libreoffice-commits
mailing list