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

[Petr Mladek]

 instsetoo_native/util/openoffice.lst |   30 +++++++++++++++---------------
 solenv/inc/minor.mk                  |    4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 526041b30fa49c3b397ae63d2d7552605f67351a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed May 23 14:35:46 2012 +0200

    bump product version to 3.5.4-rc2+
    
    Change-Id: Ie8716f9f50522f6d910a219c2dcea46a8b0fcbc6

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 9b37041..a925d7c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,13 +53,13 @@ LibreOffice
 			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc0
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.5.4
-			ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
+			ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
 			BASEPRODUCTVERSION 3.5
             PCPFILENAME libreoffice.pcp
 			UPDATEURL http://update.libreoffice.org/check.php
@@ -112,13 +112,13 @@ LibreOffice_wJRE
 			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc0
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.5.4
-			ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
+			ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
 			BASEPRODUCTVERSION 3.5
 			UPDATEURL http://update.libreoffice.org/check.php
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -170,14 +170,14 @@ LibreOffice_Dev
 			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc0
+			SHORT_PRODUCTEXTENSION rc2
 			UNIXBASISROOTNAME lodev3.5
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.5.4
-			ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
+			ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
 			BASEPRODUCTVERSION 3.5
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX lodevbasis
@@ -240,7 +240,7 @@ URE
             PRODUCTEXTENSION
             BRANDPACKAGEVERSION 3.5
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc0
+            SHORT_PRODUCTEXTENSION rc2
             LICENSENAME LGPL
             SETSTATICPATH 1
             NOVERSIONINDIRNAME 1
@@ -275,7 +275,7 @@ LibreOffice_SDK
             PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc0
+            SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3.5
@@ -318,7 +318,7 @@ LibreOffice_Dev_SDK
             PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc0
+            SHORT_PRODUCTEXTENSION rc2
             UNIXBASISROOTNAME lodev3.5
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
@@ -367,7 +367,7 @@ LibreOffice_Test
             PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc0
+            SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
             BRANDPACKAGEVERSION 3.5
@@ -410,7 +410,7 @@ LibreOffice_Dev_Test
             PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc0
+            SHORT_PRODUCTEXTENSION rc2
             UNIXBASISROOTNAME lodev3.5
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
@@ -458,13 +458,13 @@ OxygenOffice
 			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION
 			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION  rc0
+			SHORT_PRODUCTEXTENSION  rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.5.4
-			ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
+			ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
 			BASEPRODUCTVERSION 3.5
             PCPFILENAME openoffice.pcp
 			UPDATEURL http://update.libreoffice.org/check.php
@@ -522,13 +522,13 @@ OxygenOffice_wJRE
 			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION
 			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION rc0
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.5.4
-			ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
+			ABOUTBOXPRODUCTVERSIONSUFFIX rc2+
 			BASEPRODUCTVERSION 3.5
 			UPDATEURL http://update.libreoffice.org/check.php
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 68d1e78..c286f92 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=350
-RSCREVISION=350m1(Build:0)
-BUILD=0
+RSCREVISION=350m1(Build:2)
+BUILD=2
 LAST_MINOR=m1
 SOURCEVERSION=OOO350