[Libreoffice-commits] .: 5 commits -

[Petr Mladek]

 0 files changed

New commits:
commit 32aff49f9b183683c3eb2e580a6020cc2914034a
Merge: 102bc8a... 4077f80...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 8 22:47:32 2010 +0200

    Merge branch 'master' of ssh://pmladek@git.freedesktop.org/git/libreoffice/bootstrap

commit 102bc8a8a521995bcd2ff6f8465a242d10c4f9b9
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 8 17:35:12 2010 +0200

    Version 3.2.99.2, tag LIBREOFFICE_3_2_99_2 (3.3-beta2)
commit f493891a910d5e2736218a1a4146c4dee26b4bb9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 8 17:23:35 2010 +0200

    LO -> LibO

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 53e58c4..738a360 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -469,15 +469,15 @@ sub get_downloadname_productname
 
     my $start = "LO";
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LO"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; }
     
-    if ( $allvariables->{'PRODUCTNAME'} eq "LO-dev" ) { $start = "LO-Dev"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) { $start = "LibO-Dev"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LO-SDK"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "LO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LO-Dev-SDK"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
     
-    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LO-URE"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
     
     if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; }
 
commit 03aa6f1fc67e4caa9f83c01993a22238b10ce018
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 8 17:21:11 2010 +0200

    Fix smoketests with new LibreOffice directories

diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 322ba4d..396d456 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -35,11 +35,11 @@ my_file = file://
 .IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
     "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
 my_instsets = $(shell ls -dt \
-    $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
+    $(SHIPDRIVE)/$(INPATH)/LibreOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
 installationtest_instset = $(my_instsets:1)
 .ELSE
 installationtest_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)
+    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
 .END
 
 .IF "$(OS)" == "WNT"
commit 3bdaaa14213ddb3bdbcf92cccfa668259bc7fb73
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Oct 7 18:41:08 2010 +0200

    Expand the list of problematic msitrans.exe

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 98bd465..735c6e5 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1021,7 +1021,7 @@ sub create_transforms
             my $digest = Digest::MD5->new->addfile(*FILE)->hexdigest;			
             close(FILE);
 
-            my @problemchecksums = ("b66190a70145a57773ec769e16777b29", "aa25d3445b94ffde8ef0c1efb77a56b8");
+            my @problemchecksums = ("b66190a70145a57773ec769e16777b29", "aa25d3445b94ffde8ef0c1efb77a56b8", "748206e54fc93efe6a1aaa9d491f3ad1");
             my $isproblemchecksum = 0;
             
             foreach my $problemchecksum ( @problemchecksums )