[Libreoffice-commits] .: instsetoo_native/util solenv/inc

Petr Mladek pmladek at kemper.freedesktop.org
Tue Jun 5 05:46:09 PDT 2012


 instsetoo_native/util/openoffice.lst |   98 +++++++++++++++++------------------
 solenv/inc/minor.mk                  |   12 ++--
 solenv/inc/productversion.mk         |    2 
 3 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit c260b4e78e80b399defd35e9442baf2e9ed03eae
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jun 5 14:37:06 2012 +0200

    bump product version to 3.7.0-alpha0+
    
    keep the package version on 3.6.98, so we could restart release number
    from 0 for Betas and RCs
    
    Change-Id: I7a862a202d2080dcc924362e4deb0e026c940a34

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index b3c4efa..a82fa24 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,13 +4,13 @@ Globals
     {
         variables
         {
-            UREPACKAGEVERSION 3.6.0
+            UREPACKAGEVERSION 3.6.98
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 3.4
-            UNIXBASISROOTNAME libreoffice3.6
-            SERVICETAG_PRODUCTNAME LibreOffice 3.6
-            SERVICETAG_PRODUCTVERSION 3.6
-            SERVICETAG_PARENTNAME LibreOffice 3.6
+            UNIXBASISROOTNAME libreoffice3.7
+            SERVICETAG_PRODUCTNAME LibreOffice 3.7
+            SERVICETAG_PRODUCTVERSION 3.7
+            SERVICETAG_PARENTNAME LibreOffice 3.7
             SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
             SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
             HIDELICENSEDIALOG 1
@@ -47,17 +47,17 @@ LibreOffice
         variables
         {
             PRODUCTNAME LibreOffice
-            PRODUCTVERSION 3.6
+            PRODUCTVERSION 3.7
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION alpha0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3.6
+            BRANDPACKAGEVERSION 3.7
             USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.6.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX alpha1+
-            BASEPRODUCTVERSION 3.6
+            ABOUTBOXPRODUCTVERSION 3.7.0
+            ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+
+            BASEPRODUCTVERSION 3.7
             PCPFILENAME libreoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -65,7 +65,7 @@ LibreOffice
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 3.6.0
+            PACKAGEVERSION 3.6.98
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -99,18 +99,18 @@ LibreOffice_Dev
         variables
         {
             PRODUCTNAME LOdev
-            PRODUCTVERSION 3.6
+            PRODUCTVERSION 3.7
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
-            UNIXBASISROOTNAME lodev3.6
+            SHORT_PRODUCTEXTENSION alpha0
+            UNIXBASISROOTNAME lodev3.7
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3.6
+            BRANDPACKAGEVERSION 3.7
             USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.6.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX alpha1+
-            BASEPRODUCTVERSION 3.6
+            ABOUTBOXPRODUCTVERSION 3.7.0
+            ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+
+            BASEPRODUCTVERSION 3.7
             DEVELOPMENTPRODUCT 1
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -123,7 +123,7 @@ LibreOffice_Dev
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 3.6.0
+            PACKAGEVERSION 3.6.98
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -160,13 +160,13 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 3.6
-            PACKAGEVERSION 3.6
+            PRODUCTVERSION 3.7
+            PACKAGEVERSION 3.7
             PACKAGEREVISION 1
             PRODUCTEXTENSION
-            BRANDPACKAGEVERSION 3.6
+            BRANDPACKAGEVERSION 3.7
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION alpha0
             LICENSENAME LGPL
             NOVERSIONINDIRNAME 1
             PCPFILENAME ure.pcp
@@ -195,14 +195,14 @@ LibreOffice_SDK
         variables
         {
             PRODUCTNAME LibreOffice
-            PRODUCTVERSION 3.6
+            PRODUCTVERSION 3.7
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION alpha0
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3.6
-            PACKAGEVERSION 3.6.0
+            BRANDPACKAGEVERSION 3.7
+            PACKAGEVERSION 3.6.98
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION SDK
@@ -236,15 +236,15 @@ LibreOffice_Dev_SDK
         variables
         {
             PRODUCTNAME LOdev
-            PRODUCTVERSION 3.6
+            PRODUCTVERSION 3.7
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
-            UNIXBASISROOTNAME lodev3.6
+            SHORT_PRODUCTEXTENSION alpha0
+            UNIXBASISROOTNAME lodev3.7
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3.6
-            PACKAGEVERSION 3.6.0
+            BRANDPACKAGEVERSION 3.7
+            PACKAGEVERSION 3.6.98
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -283,14 +283,14 @@ LibreOffice_Test
         variables
         {
             PRODUCTNAME LibreOffice
-            PRODUCTVERSION 3.6
+            PRODUCTVERSION 3.7
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
+            SHORT_PRODUCTEXTENSION alpha0
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
-            BRANDPACKAGEVERSION 3.6
-            PACKAGEVERSION 3.6.0
+            BRANDPACKAGEVERSION 3.7
+            PACKAGEVERSION 3.6.98
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION TEST
@@ -324,15 +324,15 @@ LibreOffice_Dev_Test
         variables
         {
             PRODUCTNAME LOdev
-            PRODUCTVERSION 3.6
+            PRODUCTVERSION 3.7
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha1
-            UNIXBASISROOTNAME lodev3.6
+            SHORT_PRODUCTEXTENSION alpha0
+            UNIXBASISROOTNAME lodev3.7
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
-            BRANDPACKAGEVERSION 3.6
-            PACKAGEVERSION 3.6.0
+            BRANDPACKAGEVERSION 3.7
+            PACKAGEVERSION 3.6.98
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -370,17 +370,17 @@ OxygenOffice
         variables
         {
             PRODUCTNAME OxygenOffice
-            PRODUCTVERSION 3.6
+            PRODUCTVERSION 3.7
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION  alpha1
+            SHORT_PRODUCTEXTENSION  alpha0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3.6
+            BRANDPACKAGEVERSION 3.7
             USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.6.0
-            ABOUTBOXPRODUCTVERSIONSUFFIX alpha1+
-            BASEPRODUCTVERSION 3.6
+            ABOUTBOXPRODUCTVERSION 3.7.0
+            ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+
+            BASEPRODUCTVERSION 3.7
             PCPFILENAME openoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -388,7 +388,7 @@ OxygenOffice
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 3.6.0
+            PACKAGEVERSION 3.6.98
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a8ee513..2af8b1e 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,11 +1,11 @@
-RSCVERSION=360
-RSCREVISION=360m1(Build:1)
-BUILD=1
-LAST_MINOR=m1
-SOURCEVERSION=OOO360
+RSCVERSION=370
+RSCREVISION=370m1(Build:0)
+BUILD=0
+LAST_MINOR=m0
+SOURCEVERSION=OOO370
 
 VERSIONMAJOR=3
 VERSIONMINOR=6
-VERSIONMICRO=0
+VERSIONMICRO=98
 
 COPYRIGHTYEARRANGE=2000-2012
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index f56ebed..e307a26 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -28,5 +28,5 @@
 PRODUCTLIST = libreoffice lodev oxygenoffice
 
 # default values to minimize maintainance effort
-PRODUCTVERSION = 3.6
+PRODUCTVERSION = 3.7
 PRODUCTVERSIONSHORT = 3


More information about the Libreoffice-commits mailing list