diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-16 09:00:32 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-16 09:00:32 +0100 |
| commit | 71a43f77ada6e6091b065dd3eeb10493794bd083 (patch) | |
| tree | 2dccd312662622996eeaba0129d0142d37c8e57b | |
| parent | 4a7b487b11e0968fbda6138cf5379f4d26134a87 (diff) | |
| parent | 9a29bc269126e8f37fcbdd5cbcffc359d536df78 (diff) | |
Merge commit 'ooo/OOO330_m15' into libreoffice-3-3
Conflicts:
instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
solenv/inc/minor.mk
7 files changed, 16 insertions, 8 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt index 9bb051e56492..3968375a8815 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt @@ -2,4 +2,6 @@ Property Signature_ s72 s72 AppSearch Property Signature_ INSTALLLOCATION installuser +INSTALLLOCATION installuser_ INSTALLLOCATION installmachine +INSTALLLOCATION installmachine_ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt index 2c3517369d69..c082322086ad 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt @@ -1,5 +1,7 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -installuser 1 Software\LibreOffice\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 -installmachine 2 Software\LibreOffice\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installuser 1 Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installuser_ 1 Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine 2 Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine_ 2 Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt index 41ff1521764a..9a3dac51143c 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt @@ -2,4 +2,6 @@ Property Signature_ s72 s72 AppSearch Property Signature_ INSTALLLOCATION basisinstalluser +INSTALLLOCATION basisinstalluser_ INSTALLLOCATION basisinstallmachine +INSTALLLOCATION basisinstallmachine_ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt index d2b233364f98..995f919993eb 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt @@ -1,5 +1,7 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -basisinstalluser 1 Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstallmachine 2 Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstalluser 1 Software\LibreOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstalluser_ 1 Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstallmachine 2 Software\LibreOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +basisinstallmachine_ 2 Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp index ca3c94b759e0..4857ecf3804b 100644 --- a/scp2/source/binfilter/module_binfilter.scp +++ b/scp2/source/binfilter/module_binfilter.scp @@ -60,7 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template ParentID = gid_Module_Optional_Binfilter; Name = "gid_Module_Langpack_Binfilter_Template"; Description = "gid_Module_Langpack_Binfilter_Template"; - Default = NO; + Default = YES; Styles = (TEMPLATEMODULE); Files = (gid_File_Res_Bf_Sch, gid_File_Res_Bf_Svx, diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct index 72c209228849..ffcabf0cf587 100644 --- a/scp2/source/templates/module_langpack_binfilter.sct +++ b/scp2/source/templates/module_langpack_binfilter.sct @@ -28,7 +28,7 @@ Module gid_Module_Langpack_Binfilter_<LANGUAGE_> ParentID = gid_Module_Langpack_Root_<LANGUAGE_>; Sortkey = "900"; - Default = NO; + Default = YES; Language = "<LANGUAGE>"; Assigns = gid_Module_Langpack_Binfilter_Template; Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>"; diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index c6e863e5ccf0..94f8dc2c56d6 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m14(Build:1) +RSCREVISION=330m15(Build:1) BUILD=1 -LAST_MINOR=m14 +LAST_MINOR=m15 SOURCEVERSION=OOO330 |