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

[Petr Mladek]

 instsetoo_native/util/openoffice.lst |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 23f4ddbb2a66064925964d9f9f5bc1cfb6031288
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri May 6 19:32:42 2011 +0200

    allow to install LO-3.3 and LO-3.4 in parallel on Linux (fdo#36551)
    
    * rename the branding packages from libreoffice3 to libreoffice3.4
    * move the default root dir from /opt/libreoffice to /opt/libreoffice3.4

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 5124dde..785b203 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -9,7 +9,7 @@ Globals
 			UREPACKAGEVERSION 3.4.0
 			URELAYERVERSION 1
 			BASISROOTNAME LibreOffice
-			UNIXBASISROOTNAME libreoffice
+			UNIXBASISROOTNAME libreoffice3.4
 			SERVICETAG_PRODUCTNAME LibreOffice 3.4
 			SERVICETAG_PRODUCTVERSION 3.4
 			SERVICETAG_PARENTNAME LibreOffice 3.4
@@ -60,7 +60,7 @@ LibreOffice
 			SHORT_PRODUCTEXTENSION beta4
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -128,7 +128,7 @@ LibreOffice_wJRE
 			SHORT_PRODUCTEXTENSION beta4
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -194,7 +194,7 @@ LibreOffice_Dev
 			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -264,7 +264,7 @@ URE
             PACKAGEVERSION 3.4
             PACKAGEREVISION 1
             PRODUCTEXTENSION
-            BRANDPACKAGEVERSION 3
+            BRANDPACKAGEVERSION 3.4
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION beta4
             LICENSENAME LGPL
@@ -308,7 +308,7 @@ LibreOffice_SDK
             SHORT_PRODUCTEXTENSION beta4
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
+            BRANDPACKAGEVERSION 3.4
             PACKAGEVERSION 3.4.0
             PACKAGEREVISION {milestone}
             PACK_INSTALLED 1
@@ -356,7 +356,7 @@ LibreOffice_Dev_SDK
             UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
+            BRANDPACKAGEVERSION 3.4
             PACKAGEVERSION 3.4.0
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX libobasis-dev
@@ -407,7 +407,7 @@ OxygenOffice
 			SHORT_PRODUCTEXTENSION  beta4
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -476,7 +476,7 @@ OxygenOffice_wJRE
 			SHORT_PRODUCTEXTENSION beta4
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.3