[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - instsetoo_native/util

Andras Timar andras.timar at collabora.com
Mon Aug 25 01:15:14 PDT 2014


 instsetoo_native/util/openoffice.lst.in |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 7b8a06cf39daf8e852086cd9fbe8bf7c37f20256
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Aug 23 03:48:56 2014 -0700

    Revert "--with-lang=ALL build exceeds maximum # of files in CAB"
    
    This reverts commit 3bfac473a1b1dfb2210ec07245e649697679bd83.
    
    With Matus Kukan's work, which packs .ui files into .zip archives,
    file count is reduced dramatically. Multiple .cab files won't be a
    problem in theory, but unfortunately both .cab files had the same
    disk id 'DISK1' and it caused problems with MSP patch generation.
    
    (cherry picked from commit 29c4a88e01b6892f097c6c1e34649e7011b95fe9)
    
    Change-Id: Ie79af3ea30de9f684f7b1fbeb80f0e46ab614b27
    Reviewed-on: https://gerrit.libreoffice.org/11095
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 0e323a7..0b2344d 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -71,7 +71,6 @@ LibreOffice
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
             STARTCENTER_HIDE_EXTERNAL_LINKS 0
-            CABFILENUMBER 2
         }
         active          1
         compression     5
@@ -125,7 +124,6 @@ LibreOffice_Dev
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
             STARTCENTER_HIDE_EXTERNAL_LINKS 0
-            CABFILENUMBER 2
         }
         active          1
         compression     5


More information about the Libreoffice-commits mailing list