[Libreoffice-commits] .: 2 commits - desktop/win32 download instsetoo_native/inc_openoffice solenv/bin

[Andras Timar]

 desktop/win32/source/setup/setup.cpp                              |    4 ++--
 download                                                          |    4 ++--
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |    2 +-
 solenv/bin/modules/installer/windows/msp.pm                       |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 31cd83043eb3bf89be33a9064e04c080883bd14c
Author: Andras Timar <atimar at suse.com>
Date:   Wed Sep 7 10:51:08 2011 +0200

    update to latest version of vcredist fdo#40399

diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index ad91bfd..990d34c 100644
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -111,8 +111,8 @@ extern "C" {
 
 #define RUNTIME_X64_NAME    TEXT( "redist\\vcredist_x64.exe" )
 #define RUNTIME_X86_NAME    TEXT( "redist\\vcredist_x86.exe" )
-#define PRODUCTCODE_X86     TEXT( "{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}" )
-#define PRODUCTCODE_X64     TEXT( "{4B6C7001-C7D6-3710-913E-5BC23FCE91E6}" )
+#define PRODUCTCODE_X86     TEXT( "{9BE518E6-ECC6-35A9-88E4-87755C07200F}" )
+#define PRODUCTCODE_X64     TEXT( "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}" )
 
 #define MSIAPI_DllGetVersion     "DllGetVersion"
 #define ADVAPI32API_CheckTokenMembership "CheckTokenMembership"
diff --git a/download b/download
index adf0ba8..33e5151 100755
--- a/download
+++ b/download
@@ -180,8 +180,8 @@ if [ "$COM" = "MSC" ]; then
     msvcver=`$SRC_ROOT/oowintool --msvc-ver`
     case "$msvcver" in
         9.0)
-          downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x86.exe" "fd30acc7a696c32f661b33668e73bf7b"
-          downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x64.exe" "3abb5efe9ad4d9728406a1a90a47575f"
+          downloaditem "http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/" "vcredist_x86.exe" "35da2bf2befd998980a495b6f4f55e60"
+          downloaditem "http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/" "vcredist_x64.exe" "e2ada570911edaaae7d1b3c979345fce"
         ;;
     *)
         ;;
commit 5683be1c89d358955b34c54c16d3bd6ca06126e1
Author: Andras Timar <atimar at suse.com>
Date:   Tue Sep 6 13:16:48 2011 +0200

    enable to replace the vendor name in Windows installer, bnc#571489

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index aad2b7e..7b8b940 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -284,7 +284,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by The Document Foundation. For credits, see: http://www.documentfoundation.org"
+en-US = "Build contributed in collaboration with the community by [Manufacturer]. For credits, see: http://www.documentfoundation.org"
 
 [OOO_CONTROL_125]
 en-US = "&Next >"
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index c62e992..be9ed62 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -886,7 +886,7 @@ sub change_patchmetadata_table
     if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
 
     my $manufacturerstring = "ManufacturerName";
-    my $manufacturervalue = "LibreOffice";
+    my $manufacturervalue = $ENV{'OOO_VENDOR'};
     if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
 
     my $displaynamestring = "DisplayName";