diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-27 13:29:08 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-27 13:30:22 +0000 |
| commit | 31f9f18f86a4dd587661f210cd866f6ce1608634 (patch) | |
| tree | 07ed8369f377e2ae4c709263fe8bc844d044b8f3 /instsetoo_native | |
| parent | 4e11246cc8f0b39562daf083e894ded86a8e2146 (diff) | |
fdo#65975: do not put MSVC 64bit runtimes in solver/bin
Apparently causes problems for some people.
Unfortunately the scp2 entries are "non-standard" so i've had to add
another variable to let the installer find it.
(cherry picked from commit 9a6d5f15afa16e68d38e4a0cfd5ef904be481a17)
Conflicts:
instsetoo_native/util/openoffice.lst.in
Change-Id: I7a01160369ed8dc401625c06760008341afcee67
Reviewed-on: https://gerrit.libreoffice.org/4576
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 589781ef97f8..034aedb39240 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -82,7 +82,7 @@ LibreOffice downloadname LibreOffice_{productversion}_{os}_install_{languages} langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} - include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package + include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath} } } @@ -138,7 +138,7 @@ LibreOffice_Dev downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} - include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package + include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath} } } |