[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 5 commits - instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo scp2/source solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Nov 16 00:05:30 PST 2010
instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt | 2 ++
instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt | 6 ++++--
instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt | 2 ++
instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt | 6 ++++--
scp2/source/binfilter/module_binfilter.scp | 2 +-
scp2/source/templates/module_langpack_binfilter.sct | 2 +-
solenv/inc/minor.mk | 4 ++--
7 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit a4426b80d1fa85d63f43bdfb51c89b2d556bae66
Merge: cfe4ec5... 65adbdf...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Nov 16 09:00:32 2010 +0100
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
diff --cc instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 2c35173,661b9a4..c082322
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@@ -1,5 -1,7 +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\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installuser_ 1 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine 2 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine_ 2 Software\OpenOffice.org\Layers_\[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 --cc instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index d2b2333,072fdcf..995f919
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@@ -1,5 -1,7 +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\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\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 --cc solenv/inc/minor.mk
index c6e863e,e22bfc3..94f8dc2
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
RSCVERSION=330
- RSCREVISION=330m14(Build:1)
-RSCREVISION=330m15(Build:9546)
-BUILD=9546
++RSCREVISION=330m15(Build:1)
+BUILD=1
- LAST_MINOR=m14
+ LAST_MINOR=m15
SOURCEVERSION=OOO330
commit 65adbdfb2b6cf4f77d6232cdd4db427297ce5dad
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Nov 12 12:14:56 2010 +0100
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index aed4bf7..e22bfc3 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m14(Build:9542)
-BUILD=9542
-LAST_MINOR=m14
+RSCREVISION=330m15(Build:9546)
+BUILD=9546
+LAST_MINOR=m15
SOURCEVERSION=OOO330
commit 3ba0f5f2afde91e5a7df5a38b762deca25263545
Merge: 066088e... 0a2c91e...
Author: obo <obo at openoffice.org>
Date: Fri Nov 12 08:17:48 2010 +0100
CWS-TOOLING: integrate CWS native346
commit 0a2c91e1fa90d5ac8eddbc6be331173fc01fb174
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Nov 10 17:22:41 2010 +0100
native346 #i115501# always install binfilter resource files
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index ca3c94b..4857ecf 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 72c2092..ffcabf0 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_>";
commit cd78195d3de8135be70f6f044adbb58283f8c3aa
Author: Ingo Schmidt <is at openoffice.org>
Date: Tue Nov 9 13:25:59 2010 +0100
native346 #i115376# making update process more flexible
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 9bb051e..3968375 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 2fb2d29..661b9a4 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\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installuser 1 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installuser_ 1 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installmachine 2 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installmachine_ 2 Software\OpenOffice.org\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 41ff152..9a3dac5 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 5121f78..072fdcf 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\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser 1 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
More information about the Libreoffice-commits
mailing list