[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/bin

[Andras Timar]

 instsetoo_native/util/openoffice.lst     |    6 +++---
 solenv/bin/modules/installer/download.pm |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ea0bc3c3d48ff750dc76442b1e4f1ac4d2e9a42d
Author: Andras Timar <atimar at suse.com>
Date:   Mon Dec 12 10:00:41 2011 +0100

    change PRODUCTNAME back to LOdev, because prev. change broke Linux packaging

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 3f9b12d..93c3686 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -164,7 +164,7 @@ LibreOffice_Dev
 	{
 		variables
 		{
-			PRODUCTNAME LibO-dev
+			PRODUCTNAME LOdev
 			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
@@ -311,7 +311,7 @@ LibreOffice_Dev_SDK
         downloadname LibO-Dev-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME LibO-dev
+            PRODUCTNAME LOdev
             PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
@@ -403,7 +403,7 @@ LibreOffice_Dev_Test
         downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages}
         variables
         {
-            PRODUCTNAME LibO-dev
+            PRODUCTNAME LOdev
             PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 246adea..5f186b7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -394,15 +394,15 @@ sub get_downloadname_productname
 
     if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; }
 
-    if ( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) { $start = "LibO-Dev"; }
+    if ( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) { $start = "LibO-Dev"; }
 
     if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; }
 
-    if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-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 "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Dev-Test"; }
+    if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Dev-Test"; }
 
     if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }