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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 25 05:57:41 PDT 2012


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

New commits:
commit b6514eaae9dd58d7a8350db82e9bf415c6ad2f12
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 25 14:57:16 2012 +0200

    bump product version to 3.6.2.2+, release number to 2
    
    Change-Id: Id4b6c30dcb8502fffc31ec9062d4961c78d3672e

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 67c12c7..9cd646a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
     {
         variables
         {
-            UREPACKAGEVERSION 3.6.2.1
+            UREPACKAGEVERSION 3.6.2.2
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 3.4
             UNIXBASISROOTNAME libreoffice3.6
@@ -51,12 +51,12 @@ LibreOffice
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .2.1
+            SHORT_PRODUCTEXTENSION .2.2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 3.6
             USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.6.2.1
+            ABOUTBOXPRODUCTVERSION 3.6.2.2
             ABOUTBOXPRODUCTVERSIONSUFFIX +
             BASEPRODUCTVERSION 3.6
             PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 3.6.2.1
+            PACKAGEVERSION 3.6.2.2
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -103,13 +103,13 @@ LibreOffice_Dev
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .2.1
+            SHORT_PRODUCTEXTENSION .2.2
             UNIXBASISROOTNAME lodev3.6
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 3.6
             USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.6.2.1
+            ABOUTBOXPRODUCTVERSION 3.6.2.2
             ABOUTBOXPRODUCTVERSIONSUFFIX +
             BASEPRODUCTVERSION 3.6
             DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 3.6.2.1
+            PACKAGEVERSION 3.6.2.2
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,12 +162,12 @@ URE
         {
             PRODUCTNAME URE
             PRODUCTVERSION 3.6
-            PACKAGEVERSION 3.6.2.1
+            PACKAGEVERSION 3.6.2.2
             PACKAGEREVISION 1
             PRODUCTEXTENSION
             BRANDPACKAGEVERSION 3.6
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .2.1
+            SHORT_PRODUCTEXTENSION .2.2
             LICENSENAME LGPL
             NOVERSIONINDIRNAME 1
             PCPFILENAME ure.pcp
@@ -199,11 +199,11 @@ LibreOffice_SDK
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .2.1
+            SHORT_PRODUCTEXTENSION .2.2
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3.6
-            PACKAGEVERSION 3.6.2.1
+            PACKAGEVERSION 3.6.2.2
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION SDK
@@ -240,12 +240,12 @@ LibreOffice_Dev_SDK
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .2.1
+            SHORT_PRODUCTEXTENSION .2.2
             UNIXBASISROOTNAME lodev3.6
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3.6
-            PACKAGEVERSION 3.6.2.1
+            PACKAGEVERSION 3.6.2.2
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -287,11 +287,11 @@ LibreOffice_Test
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .2.1
+            SHORT_PRODUCTEXTENSION .2.2
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
             BRANDPACKAGEVERSION 3.6
-            PACKAGEVERSION 3.6.2.1
+            PACKAGEVERSION 3.6.2.2
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION TEST
@@ -328,12 +328,12 @@ LibreOffice_Dev_Test
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .2.1
+            SHORT_PRODUCTEXTENSION .2.2
             UNIXBASISROOTNAME lodev3.6
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
             BRANDPACKAGEVERSION 3.6
-            PACKAGEVERSION 3.6.2.1
+            PACKAGEVERSION 3.6.2.2
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -374,12 +374,12 @@ OxygenOffice
             PRODUCTVERSION 3.6
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION .2.1
+            SHORT_PRODUCTEXTENSION .2.2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 3.6
             USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.6.2.1
+            ABOUTBOXPRODUCTVERSION 3.6.2.2
             ABOUTBOXPRODUCTVERSIONSUFFIX +
             BASEPRODUCTVERSION 3.6
             PCPFILENAME openoffice.pcp
@@ -389,7 +389,7 @@ OxygenOffice
             FILEFORMATNAME OpenOffice.org
             FILEFORMATVERSION 1.0
             WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            PACKAGEVERSION 3.6.2.1
+            PACKAGEVERSION 3.6.2.2
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index af43ca1..47514b1 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:2)
+BUILD=2
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 


More information about the Libreoffice-commits mailing list