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

[Fridrich Strba]

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

New commits:
commit 2118de2768280e3cb4fb27f74a65211833f71155
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Feb 15 16:33:28 2011 +0100

    bump product version to 3.3.1rc2, release number to 8
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 232ad78..c70448f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc1
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
@@ -126,7 +126,7 @@ LibreOffice_wJRE
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc1
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
@@ -191,7 +191,7 @@ LibreOffice_Dev
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc1
+			SHORT_PRODUCTEXTENSION rc2
 			BASISROOTNAME LibO-dev
 			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
@@ -269,7 +269,7 @@ URE
             PRODUCTEXTENSION
             BRANDPACKAGEVERSION 3
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc1
+            SHORT_PRODUCTEXTENSION rc2
             LICENSENAME LGPL
             SERVICESPROJEKT 1
             SETSTATICPATH 1
@@ -310,7 +310,7 @@ LibreOffice_SDK
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc1
+            SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
@@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc1
+            SHORT_PRODUCTEXTENSION rc2
             BASISROOTNAME LibO-dev
             UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index dc03e46..b539511 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m19(Build:7)
-BUILD=7
+RSCREVISION=330m19(Build:8)
+BUILD=8
 LAST_MINOR=m19
 SOURCEVERSION=OOO330
commit 8df6667e9f53e8b006dff98004be5ecf71bab3ce
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Feb 8 15:36:06 2011 +0100

    bump product version to 3.3.1rc1, widnows build version to 6
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 2ab17bf..232ad78 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
 		variables
 		{
 			OOOBASEVERSION 3.3
-			OOOPACKAGEVERSION 3.3.0
+			OOOPACKAGEVERSION 3.3.1
 			UREPACKAGEVERSION 1.7.0
 			URELAYERVERSION 1
 			BASISROOTNAME LibreOffice
@@ -57,12 +57,12 @@ LibreOffice
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc4
+			SHORT_PRODUCTEXTENSION rc1
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.3.1
 			BASEPRODUCTVERSION 3.3
             PCPFILENAME openoffice.pcp
 			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -74,7 +74,7 @@ LibreOffice
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.3.1
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -126,12 +126,12 @@ LibreOffice_wJRE
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc4
+			SHORT_PRODUCTEXTENSION rc1
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.3.1
 			BASEPRODUCTVERSION 3.3
 			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -142,7 +142,7 @@ LibreOffice_wJRE
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.3.1
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -191,14 +191,14 @@ LibreOffice_Dev
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc4
+			SHORT_PRODUCTEXTENSION rc1
 			BASISROOTNAME LibO-dev
 			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.3.1
 			BASEPRODUCTVERSION 3.3
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX libobasis-dev
@@ -213,7 +213,7 @@ LibreOffice_Dev
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.3.1
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -269,7 +269,7 @@ URE
             PRODUCTEXTENSION
             BRANDPACKAGEVERSION 3
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc4
+            SHORT_PRODUCTEXTENSION rc1
             LICENSENAME LGPL
             SERVICESPROJEKT 1
             SETSTATICPATH 1
@@ -310,11 +310,11 @@ LibreOffice_SDK
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc4
+            SHORT_PRODUCTEXTENSION rc1
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.3.0
+            PACKAGEVERSION 3.3.1
             PACKAGEREVISION {milestone}
             PACK_INSTALLED 1
             POOLPRODUCT 0
@@ -355,13 +355,13 @@ LibreOffice_Dev_SDK
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc4
+            SHORT_PRODUCTEXTENSION rc1
             BASISROOTNAME LibO-dev
             UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.3.0
+            PACKAGEVERSION 3.3.1
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX libobasis-dev
             UREPACKAGEPREFIX lodev
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 3e2745f..dc03e46 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m19(Build:6)
-BUILD=6
+RSCREVISION=330m19(Build:7)
+BUILD=7
 LAST_MINOR=m19
 SOURCEVERSION=OOO330