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

Petr Mladek pmladek at kemper.freedesktop.org
Wed Dec 7 13:36:38 PST 2011


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

New commits:
commit 9b5e6c1b2f7742f34f26881a104b07d092541142
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Dec 7 22:35:55 2011 +0100

    Revert "mention version suffix, e.g. "beta1" in about dialog"
    
    broke build on MAC; need better solution after beta1 tag
    
    This reverts commit fec8058db415db791c51d4a81435cf1f93b304e7.

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index d505a06..0cfafc5 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -51,9 +51,9 @@ LibreOffice
 		{
 			PRODUCTNAME LibreOffice
 			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION beta1-test 
+			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta1-test
+			SHORT_PRODUCTEXTENSION beta0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5
@@ -109,9 +109,9 @@ LibreOffice_wJRE
 		{
 			PRODUCTNAME LibreOffice
 			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION beta1-test 
+			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta1-test
+			SHORT_PRODUCTEXTENSION beta0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5
@@ -166,9 +166,9 @@ LibreOffice_Dev
 		{
 			PRODUCTNAME LOdev
 			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION beta1-test 
+			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta1-test
+			SHORT_PRODUCTEXTENSION beta0
 			UNIXBASISROOTNAME lodev3.5
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
@@ -234,10 +234,10 @@ URE
             PRODUCTVERSION 3.5
             PACKAGEVERSION 3.5
             PACKAGEREVISION 1
-            PRODUCTEXTENSION beta1-test
+            PRODUCTEXTENSION
             BRANDPACKAGEVERSION 3.5
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta1-test
+            SHORT_PRODUCTEXTENSION beta0
             LICENSENAME LGPL
             SETSTATICPATH 1
             NOVERSIONINDIRNAME 1
@@ -270,9 +270,9 @@ LibreOffice_SDK
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 3.5
-            PRODUCTEXTENSION beta1-test
+            PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta1-test
+            SHORT_PRODUCTEXTENSION beta0
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3.5
@@ -313,9 +313,9 @@ LibreOffice_Dev_SDK
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 3.5
-            PRODUCTEXTENSION beta1-test
+            PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta1-test
+            SHORT_PRODUCTEXTENSION beta0
             UNIXBASISROOTNAME lodev3.5
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
@@ -362,7 +362,7 @@ LibreOffice_Test
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 3.5
-            PRODUCTEXTENSION beta1-test
+            PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION alpha0
             POSTVERSIONEXTENSION TEST
@@ -405,7 +405,7 @@ LibreOffice_Dev_Test
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 3.5
-            PRODUCTEXTENSION beta1-test
+            PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION alpha0
             UNIXBASISROOTNAME lodev3.5
@@ -453,9 +453,9 @@ OxygenOffice
 		{
 			PRODUCTNAME OxygenOffice
 			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION beta1-test
+			PRODUCTEXTENSION
 			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION  beta1-test
+			SHORT_PRODUCTEXTENSION  beta0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5
@@ -516,9 +516,9 @@ OxygenOffice_wJRE
 		{
 			PRODUCTNAME OxygenOffice
 			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION beta1-test
+			PRODUCTEXTENSION
 			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION beta1-test
+			SHORT_PRODUCTEXTENSION beta0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5


More information about the Libreoffice-commits mailing list