[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 2 commits - configure.ac instsetoo_native/util setup_native/source solenv/bin

[Andras Timar]

 configure.ac                                      |    2 +-
 instsetoo_native/util/openoffice.lst.in           |    2 +-
 setup_native/source/packinfo/finals_instsetoo.txt |    1 +
 solenv/bin/modules/installer/globals.pm           |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 02b4563d8ac90063a56f86e8db2196ee491a83c5
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jan 12 13:41:18 2014 -0800

    enable MSP creation
    
    Change-Id: I3d28cae66d8658505e2339d22304c1b3852fbb43

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 407b912..b4f74220 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -26,7 +26,7 @@ Globals
             REGISTRYLAYERNAME Layers
             SERVICEPACK 1
             UPDATE_DATABASE 1
-            CREATE_MSP_INSTALLSET 0
+            CREATE_MSP_INSTALLSET 1
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
             PACKAGEMAP package_names.txt,package_names_ext.txt
             WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt b/setup_native/source/packinfo/finals_instsetoo.txt
index d5a68d36..b45b52943 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt
@@ -30,3 +30,4 @@
 # OpenOffice	pro		de			\\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack	pro	es	\\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE			pro		en-US		\\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
+LibreOffice		pro		en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW		c:\lo\src\cp-4.3-5\LibreOffice_4.3-5_Win_x86.msi
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 2076e8b..ed22148 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -219,7 +219,7 @@ BEGIN
     $fix_number_of_cab_files = 1;
     $cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression)
     $number_of_cabfiles = 1;    # only for $fix_number_of_cab_files = 1
-    $include_cab_in_msi = 1;
+    $include_cab_in_msi = 0;
     $msidatabasename = "";
     $prepare_winpatch = 0;
     $previous_idt_dir = "";
commit cbe116caa67cb5e6d1639ef0394d7d91d4027b09
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Apr 8 02:53:47 2015 -0700

    Bump version to 4.3-6
    
    Change-Id: I0d0e94d10204c33dc5055a7a48a9c17d9726b5af

diff --git a/configure.ac b/configure.ac
index fe6878b..e3cd488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[4.3.10.5],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.3.10.6],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])