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

[Petr Mladek]

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

New commits:
commit e81aa423367882a074b50c9e7c822e186141b9a2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jun 14 10:19:48 2012 +0200

    bump product version to 3.6.0-beta1+
    
    Change-Id: I244bd6e896a11a1209dca059a8040bbefb6318be

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index b3c4efa..2224b4d 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -50,13 +50,13 @@ LibreOffice
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION beta1
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 3.6
             USERDIRPRODUCTVERSION 3
             ABOUTBOXPRODUCTVERSION 3.6.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX alpha1+
+            ABOUTBOXPRODUCTVERSIONSUFFIX beta1+
             BASEPRODUCTVERSION 3.6
             PCPFILENAME libreoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
@@ -102,14 +102,14 @@ LibreOffice_Dev
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION beta1
             UNIXBASISROOTNAME lodev3.6
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 3.6
             USERDIRPRODUCTVERSION 3
             ABOUTBOXPRODUCTVERSION 3.6.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX alpha1+
+            ABOUTBOXPRODUCTVERSIONSUFFIX beta1+
             BASEPRODUCTVERSION 3.6
             DEVELOPMENTPRODUCT 1
             BASISPACKAGEPREFIX lodevbasis
@@ -166,7 +166,7 @@ URE
             PRODUCTEXTENSION
             BRANDPACKAGEVERSION 3.6
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION beta1
             LICENSENAME LGPL
             NOVERSIONINDIRNAME 1
             PCPFILENAME ure.pcp
@@ -198,7 +198,7 @@ LibreOffice_SDK
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION beta1
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3.6
@@ -239,7 +239,7 @@ LibreOffice_Dev_SDK
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION beta1
             UNIXBASISROOTNAME lodev3.6
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
@@ -286,7 +286,7 @@ LibreOffice_Test
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION beta1
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
             BRANDPACKAGEVERSION 3.6
@@ -327,7 +327,7 @@ LibreOffice_Dev_Test
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION beta1
             UNIXBASISROOTNAME lodev3.6
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
@@ -373,13 +373,13 @@ OxygenOffice
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION  alpha1
+            SHORT_PRODUCTEXTENSION  beta1
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 3.6
             USERDIRPRODUCTVERSION 3
             ABOUTBOXPRODUCTVERSION 3.6.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX alpha1+
+            ABOUTBOXPRODUCTVERSIONSUFFIX beta1+
             BASEPRODUCTVERSION 3.6
             PCPFILENAME openoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a8ee513..69e79bd 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:1)
-BUILD=1
+RSCREVISION=360m1(Build:11)
+BUILD=11
 LAST_MINOR=m1
 SOURCEVERSION=OOO360