diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-27 10:24:24 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-27 10:27:02 +0200 |
commit | cbaadc7b05974ee13795ac182afd1b3121708d60 (patch) | |
tree | 1efccf01206fb7d056bbb60cab34250288f284d5 | |
parent | 977506ef8f19e9c2c719547537872df64f8c56d3 (diff) |
Undo basis/brand split: removed obsoleted BASISROOTNAME.
-rw-r--r-- | instsetoo_native/util/openoffice.lst | 3 | ||||
-rw-r--r-- | solenv/bin/modules/installer/windows/property.pm | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 35c927d39963..c9c0e208be2d 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -8,7 +8,6 @@ Globals OOOPACKAGEVERSION 3.5.0 UREPACKAGEVERSION 3.5.0 URELAYERVERSION 1 - BASISROOTNAME LibreOffice UNIXBASISROOTNAME libreoffice3.5 SERVICETAG_PRODUCTNAME LibreOffice 3.5 SERVICETAG_PRODUCTVERSION 3.5 @@ -186,7 +185,6 @@ LibreOffice_Dev PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION alpha0 - BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX @@ -346,7 +344,6 @@ LibreOffice_Dev_SDK PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION alpha0 - BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 7a2bc5193d25..110271bbeda0 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -298,12 +298,6 @@ sub set_important_properties push(@{$propertyfile}, $onepropertyline); } - if ( $allvariables->{'BASISROOTNAME'} ) - { - my $onepropertyline = "BASISROOTNAME" . "\t" . $allvariables->{'BASISROOTNAME'} . "\n"; - push(@{$propertyfile}, $onepropertyline); - } - if ( $allvariables->{'EXCLUDE_FROM_REBASE'} ) { my $onepropertyline = "EXCLUDE_FROM_REBASE" . "\t" . $allvariables->{'EXCLUDE_FROM_REBASE'} . "\n"; |