[Libreoffice-commits] .: configure.ac instsetoo_native/util solenv/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 4 08:18:46 PST 2012
configure.ac | 2
instsetoo_native/util/openoffice.lst | 92 +++++++++++++++++------------------
solenv/inc/minor.mk | 6 +-
solenv/inc/productversion.mk | 2
4 files changed, 51 insertions(+), 51 deletions(-)
New commits:
commit 0178ef0039a10a9d2adfe081845ac2e6e8e0ef05
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Dec 4 17:17:11 2012 +0100
bump product version to 4.1.0.0.alpha0+, build id to 0
Change-Id: I0a8e86dc862b05e8c92738a565ae1513ea9e60b0
diff --git a/configure.ac b/configure.ac
index 9af58c7..bb7575f 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],[4.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1],[],[],[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 2f1ccf8..487f460 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,13 +4,13 @@ Globals
{
variables
{
- UREPACKAGEVERSION 4.0.0.0.alpha1
+ UREPACKAGEVERSION 4.1.0.0.alpha0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
- UNIXBASISROOTNAME libreoffice4.0
- SERVICETAG_PRODUCTNAME LibreOffice 4.0
- SERVICETAG_PRODUCTVERSION 4.0
- SERVICETAG_PARENTNAME LibreOffice 4.0
+ UNIXBASISROOTNAME libreoffice4.1
+ SERVICETAG_PRODUCTNAME LibreOffice 4.1
+ SERVICETAG_PRODUCTVERSION 4.1
+ SERVICETAG_PARENTNAME LibreOffice 4.1
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 4.0
+ PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.alpha1
+ SHORT_PRODUCTEXTENSION .0.0.alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 4.0
+ BRANDPACKAGEVERSION 4.1
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
- BASEPRODUCTVERSION 4.0
+ BASEPRODUCTVERSION 4.1
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 4.0.0.0.alpha1
+ PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -99,18 +99,18 @@ LibreOffice_Dev
variables
{
PRODUCTNAME LOdev
- PRODUCTVERSION 4.0
+ PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.alpha1
- UNIXBASISROOTNAME lodev4.0
+ SHORT_PRODUCTEXTENSION .0.0.alpha0
+ UNIXBASISROOTNAME lodev4.1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 4.0
+ BRANDPACKAGEVERSION 4.1
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
- BASEPRODUCTVERSION 4.0
+ BASEPRODUCTVERSION 4.1
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -123,7 +123,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 4.0.0.0.alpha1
+ PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -160,13 +160,13 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 4.0
- PACKAGEVERSION 4.0.0.0.alpha1
+ PRODUCTVERSION 4.1
+ PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION 1
PRODUCTEXTENSION
- BRANDPACKAGEVERSION 4.0
+ BRANDPACKAGEVERSION 4.1
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.alpha1
+ SHORT_PRODUCTEXTENSION .0.0.alpha0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@ -195,14 +195,14 @@ LibreOffice_SDK
variables
{
PRODUCTNAME LibreOffice
- PRODUCTVERSION 4.0
+ PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.alpha1
+ SHORT_PRODUCTEXTENSION .0.0.alpha0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 4.0
- PACKAGEVERSION 4.0.0.0.alpha1
+ BRANDPACKAGEVERSION 4.1
+ PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -236,15 +236,15 @@ LibreOffice_Dev_SDK
variables
{
PRODUCTNAME LOdev
- PRODUCTVERSION 4.0
+ PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.alpha1
- UNIXBASISROOTNAME lodev4.0
+ SHORT_PRODUCTEXTENSION .0.0.alpha0
+ UNIXBASISROOTNAME lodev4.1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 4.0
- PACKAGEVERSION 4.0.0.0.alpha1
+ BRANDPACKAGEVERSION 4.1
+ PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -283,14 +283,14 @@ LibreOffice_Test
variables
{
PRODUCTNAME LibreOffice
- PRODUCTVERSION 4.0
+ PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.alpha1
+ SHORT_PRODUCTEXTENSION .0.0.alpha0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
- BRANDPACKAGEVERSION 4.0
- PACKAGEVERSION 4.0.0.0.alpha1
+ BRANDPACKAGEVERSION 4.1
+ PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -324,15 +324,15 @@ LibreOffice_Dev_Test
variables
{
PRODUCTNAME LOdev
- PRODUCTVERSION 4.0
+ PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.alpha1
- UNIXBASISROOTNAME lodev4.0
+ SHORT_PRODUCTEXTENSION .0.0.alpha0
+ UNIXBASISROOTNAME lodev4.1
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
- BRANDPACKAGEVERSION 4.0
- PACKAGEVERSION 4.0.0.0.alpha1
+ BRANDPACKAGEVERSION 4.1
+ PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -370,17 +370,17 @@ OxygenOffice
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTVERSION 4.0
+ PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .0.0.alpha1
+ SHORT_PRODUCTEXTENSION .0.0.alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 4.0
+ BRANDPACKAGEVERSION 4.1
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
- BASEPRODUCTVERSION 4.0
+ BASEPRODUCTVERSION 4.1
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 4.0.0.0.alpha1
+ PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 3b7d55a..af25dbc 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,11 +1,11 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:1)
-BUILD=1
+RSCREVISION=400m1(Build:0)
+BUILD=0
LAST_MINOR=m0
SOURCEVERSION=OOO400
VERSIONMAJOR=4
-VERSIONMINOR=0
+VERSIONMINOR=1
VERSIONMICRO=0
COPYRIGHTYEARRANGE=2000-2012
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index 71c4cba..cf58858 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -22,7 +22,7 @@ PRODUCTLIST = libreoffice lodev oxygenoffice
# default values to minimize maintainance effort
# CAUTION! $(PRODUCTVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.0
+PRODUCTVERSION = 4.1
# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
PRODUCTVERSIONSHORT = 4
More information about the Libreoffice-commits
mailing list