[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util solenv/inc

Petr Mladek pmladek at suse.cz
Wed Apr 17 02:24:28 PDT 2013


 instsetoo_native/util/openoffice.lst |   46 +++++++++++++++++------------------
 solenv/inc/minor.mk                  |    6 ++--
 2 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit e0f25870cd41637d6705fb497f6e3327517b92d0
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 17 11:22:06 2013 +0200

    set version for SUSE 4.0-rc1
    
        + version 4.0
        + version suffix to -1
        + micro version to 10
        + buildid to 201
    
    Change-Id: I4f741a38666a277ea332e7d65e9e0e72afbbe551

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index b08c40e..0ae22b0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
     {
         variables
         {
-            UREPACKAGEVERSION 4.0.2.2
+            UREPACKAGEVERSION 4.0
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 3.4
             UNIXBASISROOTNAME libreoffice4.0
@@ -50,13 +50,13 @@ LibreOffice
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION .2.2
+            PRODUCTEXTENSION -1
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4.0
             USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.0.2.2
-            ABOUTBOXPRODUCTVERSIONSUFFIX
+            ABOUTBOXPRODUCTVERSION 4.0
+            ABOUTBOXPRODUCTVERSIONSUFFIX :build-201
             BASEPRODUCTVERSION 4.0
             PCPFILENAME libreoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
@@ -65,7 +65,7 @@ LibreOffice
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 4.0.2.2
+            PACKAGEVERSION 4.0
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,14 +100,14 @@ LibreOffice_Dev
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION .2.2
+            PRODUCTEXTENSION -1
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4.0
             USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.0.2.2
-            ABOUTBOXPRODUCTVERSIONSUFFIX
+            ABOUTBOXPRODUCTVERSION 4.0
+            ABOUTBOXPRODUCTVERSIONSUFFIX :build-201
             BASEPRODUCTVERSION 4.0
             DEVELOPMENTPRODUCT 1
             BASISPACKAGEPREFIX lodevbasis
@@ -121,7 +121,7 @@ LibreOffice_Dev
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 4.0.2.2
+            PACKAGEVERSION 4.0
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
         {
             PRODUCTNAME URE
             PRODUCTVERSION 4.0
-            PACKAGEVERSION 4.0.2.2
+            PACKAGEVERSION 4.0
             PACKAGEREVISION 1
-            PRODUCTEXTENSION .2.2
+            PRODUCTEXTENSION -1
             BRANDPACKAGEVERSION 4.0
             LICENSENAME LGPL
             NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION .2.2
+            PRODUCTEXTENSION -1
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 4.0
-            PACKAGEVERSION 4.0.2.2
+            PACKAGEVERSION 4.0
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION .2.2
+            PRODUCTEXTENSION -1
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 4.0
-            PACKAGEVERSION 4.0.2.2
+            PACKAGEVERSION 4.0
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
         {
             PRODUCTNAME LibreOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION .2.2
+            PRODUCTEXTENSION -1
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
             BRANDPACKAGEVERSION 4.0
-            PACKAGEVERSION 4.0.2.2
+            PACKAGEVERSION 4.0
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
         {
             PRODUCTNAME LOdev
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION .2.2
+            PRODUCTEXTENSION -1
             UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
             BRANDPACKAGEVERSION 4.0
-            PACKAGEVERSION 4.0.2.2
+            PACKAGEVERSION 4.0
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -359,13 +359,13 @@ OxygenOffice
         {
             PRODUCTNAME OxygenOffice
             PRODUCTVERSION 4.0
-            PRODUCTEXTENSION .2.2
+            PRODUCTEXTENSION -1
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4.0
             USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.0.2.2
-            ABOUTBOXPRODUCTVERSIONSUFFIX
+            ABOUTBOXPRODUCTVERSION 4.0
+            ABOUTBOXPRODUCTVERSIONSUFFIX :build-201
             BASEPRODUCTVERSION 4.0
             PCPFILENAME openoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
@@ -374,7 +374,7 @@ OxygenOffice
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 4.0.2.2
+            PACKAGEVERSION 4.0
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 20174e1..927533e 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,11 +1,11 @@
 RSCVERSION=400
-RSCREVISION=400m1(Build:2)
-BUILD=2
+RSCREVISION=400m1(Build:201)
+BUILD=201
 LAST_MINOR=m0
 SOURCEVERSION=OOO400
 
 VERSIONMAJOR=4
 VERSIONMINOR=0
-VERSIONMICRO=2
+VERSIONMICRO=10
 
 COPYRIGHTYEARRANGE=2000-2013


More information about the Libreoffice-commits mailing list