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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 12 03:34:27 PST 2012


 configure.ac                         |    2 
 instsetoo_native/util/openoffice.lst |   90 +++++++++++++++++------------------
 solenv/inc/minor.mk                  |   10 +--
 solenv/inc/productversion.mk         |    4 -
 4 files changed, 53 insertions(+), 53 deletions(-)

New commits:
commit bf83aaf609cfec6ebc7d2bfa0f088e972ba28e22
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Nov 12 12:31:35 2012 +0100

    bump version to 4.0.0.0.alpha0+
    
    Change-Id: I04cb89d04ebebcaef2276813864f79365f6899fd

diff --git a/configure.ac b/configure.ac
index d940aa9..35727c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*
 dnl configure.ac serves as input for the GNU autoconf package
 dnl in order to create a configure script.
 
-AC_INIT([LibreOffice],[3.7],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.0],[],[],[http://documentfoundation.org/])
 AC_PREREQ([2.59])
 
 save_CC=$CC
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 0739bd7..1cdf3f7 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,13 +4,13 @@ Globals
     {
         variables
         {
-            UREPACKAGEVERSION 3.7.0.0.alpha0
+            UREPACKAGEVERSION 4.0.0.0.alpha0
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 3.4
-            UNIXBASISROOTNAME libreoffice3.7
-            SERVICETAG_PRODUCTNAME LibreOffice 3.7
-            SERVICETAG_PRODUCTVERSION 3.7
-            SERVICETAG_PARENTNAME LibreOffice 3.7
+            UNIXBASISROOTNAME libreoffice4.0
+            SERVICETAG_PRODUCTNAME LibreOffice 4.0
+            SERVICETAG_PRODUCTVERSION 4.0
+            SERVICETAG_PARENTNAME LibreOffice 4.0
             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.7
+            PRODUCTVERSION 4.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION .0.0.alpha0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3.7
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.7.0.0.alpha0
+            BRANDPACKAGEVERSION 4.0
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha0
             ABOUTBOXPRODUCTVERSIONSUFFIX +
-            BASEPRODUCTVERSION 3.7
+            BASEPRODUCTVERSION 4.0
             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.7.0.0.alpha0
+            PACKAGEVERSION 4.0.0.0.alpha0
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -99,18 +99,18 @@ LibreOffice_Dev
         variables
         {
             PRODUCTNAME LOdev
-            PRODUCTVERSION 3.7
+            PRODUCTVERSION 4.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION .0.0.alpha0
-            UNIXBASISROOTNAME lodev3.7
+            UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3.7
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.7.0.0.alpha0
+            BRANDPACKAGEVERSION 4.0
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha0
             ABOUTBOXPRODUCTVERSIONSUFFIX +
-            BASEPRODUCTVERSION 3.7
+            BASEPRODUCTVERSION 4.0
             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.7.0.0.alpha0
+            PACKAGEVERSION 4.0.0.0.alpha0
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -160,11 +160,11 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 3.7
-            PACKAGEVERSION 3.7.0.0.alpha0
+            PRODUCTVERSION 4.0
+            PACKAGEVERSION 4.0.0.0.alpha0
             PACKAGEREVISION 1
             PRODUCTEXTENSION
-            BRANDPACKAGEVERSION 3.7
+            BRANDPACKAGEVERSION 4.0
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION .0.0.alpha0
             LICENSENAME LGPL
@@ -195,18 +195,18 @@ LibreOffice_SDK
         variables
         {
             PRODUCTNAME LibreOffice
-            PRODUCTVERSION 3.7
+            PRODUCTVERSION 4.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION .0.0.alpha0
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3.7
-            PACKAGEVERSION 3.7.0.0.alpha0
+            BRANDPACKAGEVERSION 4.0
+            PACKAGEVERSION 4.0.0.0.alpha0
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME libreoffice35sdk
+            DATABASENAME libreoffice40sdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -236,15 +236,15 @@ LibreOffice_Dev_SDK
         variables
         {
             PRODUCTNAME LOdev
-            PRODUCTVERSION 3.7
+            PRODUCTVERSION 4.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION .0.0.alpha0
-            UNIXBASISROOTNAME lodev3.7
+            UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3.7
-            PACKAGEVERSION 3.7.0.0.alpha0
+            BRANDPACKAGEVERSION 4.0
+            PACKAGEVERSION 4.0.0.0.alpha0
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -253,7 +253,7 @@ LibreOffice_Dev_SDK
             DEVELOPMENTPRODUCT 1
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME libreoffice35devsdk
+            DATABASENAME libreoffice40devsdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -283,18 +283,18 @@ LibreOffice_Test
         variables
         {
             PRODUCTNAME LibreOffice
-            PRODUCTVERSION 3.7
+            PRODUCTVERSION 4.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION .0.0.alpha0
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
-            BRANDPACKAGEVERSION 3.7
-            PACKAGEVERSION 3.7.0.0.alpha0
+            BRANDPACKAGEVERSION 4.0
+            PACKAGEVERSION 4.0.0.0.alpha0
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION TEST
-            DATABASENAME libreoffice35test
+            DATABASENAME libreoffice40test
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -324,15 +324,15 @@ LibreOffice_Dev_Test
         variables
         {
             PRODUCTNAME LOdev
-            PRODUCTVERSION 3.7
+            PRODUCTVERSION 4.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION .0.0.alpha0
-            UNIXBASISROOTNAME lodev3.7
+            UNIXBASISROOTNAME lodev4.0
             POSTVERSIONEXTENSION TEST
             POSTVERSIONEXTENSIONUNIX test
-            BRANDPACKAGEVERSION 3.7
-            PACKAGEVERSION 3.7.0.0.alpha0
+            BRANDPACKAGEVERSION 4.0
+            PACKAGEVERSION 4.0.0.0.alpha0
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX lodevbasis
             UREPACKAGEPREFIX lodev
@@ -341,7 +341,7 @@ LibreOffice_Dev_Test
             DEVELOPMENTPRODUCT 1
             PACK_INSTALLED 1
             DMG_VOLUMEEXTENSION TEST
-            DATABASENAME libreoffice35devtest
+            DATABASENAME libreoffice40devtest
             NO_README_IN_ROOTDIR 1
             LICENSENAME LGPL
             IGNOREDIRECTORYLAYER 1
@@ -370,17 +370,17 @@ OxygenOffice
         variables
         {
             PRODUCTNAME OxygenOffice
-            PRODUCTVERSION 3.7
+            PRODUCTVERSION 4.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION .0.0.alpha0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3.7
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.7.0.0.alpha0
+            BRANDPACKAGEVERSION 4.0
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha0
             ABOUTBOXPRODUCTVERSIONSUFFIX +
-            BASEPRODUCTVERSION 3.7
+            BASEPRODUCTVERSION 4.0
             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.7.0.0.alpha0
+            PACKAGEVERSION 4.0.0.0.alpha0
             PACKAGEREVISION {buildid}
             LICENSENAME LGPL
             SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index ab0e3e1..2da4cf5 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,11 +1,11 @@
-RSCVERSION=370
-RSCREVISION=370m1(Build:0)
+RSCVERSION=400
+RSCREVISION=400m1(Build:0)
 BUILD=0
 LAST_MINOR=m0
-SOURCEVERSION=OOO370
+SOURCEVERSION=OOO400
 
-VERSIONMAJOR=3
-VERSIONMINOR=7
+VERSIONMAJOR=4
+VERSIONMINOR=0
 VERSIONMICRO=0
 
 COPYRIGHTYEARRANGE=2000-2012
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index e307a26..22f8588 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.7
-PRODUCTVERSIONSHORT = 3
+PRODUCTVERSION = 4.0
+PRODUCTVERSIONSHORT = 4


More information about the Libreoffice-commits mailing list