diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-01-07 17:43:53 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-07 18:05:16 +0100 |
| commit | 44cd995f02d2b46e5b0bfb3cbd743a366d4284f7 (patch) | |
| tree | 1a15182b537ed0e3c02937fd5c27af33406fb24e | |
| parent | 40ce68b3318b2c9205a5e58ced9a7e733951594d (diff) | |
use "LibreOffice" instead of "LibO" for final download file names
"LibreOffice" is the name of the product and we should promote it.
This change has been proposed on the ESC call.
Change-Id: I755ea5b2ec7b6357a7fd2c86ec8479737696042b
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 8 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 487f4608efd1..94197bfba5cb 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -85,9 +85,9 @@ LibreOffice active 1 compression 5 script setup_osl - downloadname LibO_{productversion}_{os}_install_{languages} - langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages} - helppackdownloadname LibO_{productversion}_helppack_{os}_install_{languages} + downloadname LibreOffice_{productversion}_{os}_install_{languages} + langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} + helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external } } @@ -191,7 +191,7 @@ LibreOffice_SDK { Settings { - downloadname LibO-SDK_{packageversion}_{os}_install_{languages} + downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages} variables { PRODUCTNAME LibreOffice diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 07308c5a0ecc..97d29a86348a 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -314,21 +314,21 @@ sub get_downloadname_productname { my ($allvariables) = @_; - my $start = "LibO"; + my $start = "LibreOffice"; - if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; } + if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibreOffice"; } if ( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) { $start = "LibO-Dev"; } - if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; } + if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibreOffice-SDK"; } if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; } - if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Test"; } + if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibreOffice-Test"; } if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Dev-Test"; } - if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; } + if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibreOffice-URE"; } if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; } |