summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-12-08 21:13:48 +0200
committerTor Lillqvist <tml@iki.fi>2011-12-08 23:40:37 +0200
commitbbc609921336ee758f0ce9e31673b6468f4b233c (patch)
tree12fa412572e4d6f1c1eefa4ef6ddce18440f3d67
parent52422457d4aada3d9a12cd8cf2945c46dea7b275 (diff)
Bump version to 3.6 (3.6.0, 360, 360m1)
-rw-r--r--configure.in2
-rw-r--r--instsetoo_native/util/openoffice.lst86
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/productversion.mk2
4 files changed, 48 insertions, 48 deletions
diff --git a/configure.in b/configure.in
index 0fe12fa14f25..509ce0393547 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil -*-
dnl configure.in serves as input for the GNU autoconf package
dnl in order to create a configure script.
-AC_INIT([LibreOffice],[3.5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[3.6],[],[],[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 72caad818839..a562e456fc29 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,13 +4,13 @@ Globals
{
variables
{
- UREPACKAGEVERSION 3.5.0
+ UREPACKAGEVERSION 3.6.0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
- UNIXBASISROOTNAME libreoffice3.5
- SERVICETAG_PRODUCTNAME LibreOffice 3.5
- SERVICETAG_PRODUCTVERSION 3.5
- SERVICETAG_PARENTNAME LibreOffice 3.5
+ UNIXBASISROOTNAME libreoffice3.6
+ SERVICETAG_PRODUCTNAME LibreOffice 3.6
+ SERVICETAG_PRODUCTVERSION 3.6
+ SERVICETAG_PARENTNAME LibreOffice 3.6
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1
@@ -50,16 +50,16 @@ LibreOffice
variables
{
PRODUCTNAME LibreOffice
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.5
+ BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
+ ABOUTBOXPRODUCTVERSION 3.6.0
+ BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
@@ -69,7 +69,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.0
+ PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -108,17 +108,17 @@ LibreOffice_Dev
variables
{
PRODUCTNAME LOdev
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
- UNIXBASISROOTNAME lodev3.5
+ UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.5
+ BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
+ ABOUTBOXPRODUCTVERSION 3.6.0
+ BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -132,7 +132,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.0
+ PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -174,11 +174,11 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 3.5
- PACKAGEVERSION 3.5
+ PRODUCTVERSION 3.6
+ PACKAGEVERSION 3.6
PACKAGEREVISION 1
PRODUCTEXTENSION
- BRANDPACKAGEVERSION 3.5
+ BRANDPACKAGEVERSION 3.6
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
LICENSENAME LGPL
@@ -212,14 +212,14 @@ LibreOffice_SDK
variables
{
PRODUCTNAME LibreOffice
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 3.5
- PACKAGEVERSION 3.5.0
+ BRANDPACKAGEVERSION 3.6
+ PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -255,15 +255,15 @@ LibreOffice_Dev_SDK
variables
{
PRODUCTNAME LOdev
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
- UNIXBASISROOTNAME lodev3.5
+ UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 3.5
- PACKAGEVERSION 3.5.0
+ BRANDPACKAGEVERSION 3.6
+ PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -304,14 +304,14 @@ LibreOffice_Test
variables
{
PRODUCTNAME LibreOffice
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION alpha0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
- BRANDPACKAGEVERSION 3.5
- PACKAGEVERSION 3.5.0
+ BRANDPACKAGEVERSION 3.6
+ PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -347,15 +347,15 @@ LibreOffice_Dev_Test
variables
{
PRODUCTNAME LOdev
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION alpha0
- UNIXBASISROOTNAME lodev3.5
+ UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
- BRANDPACKAGEVERSION 3.5
- PACKAGEVERSION 3.5.0
+ BRANDPACKAGEVERSION 3.6
+ PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -395,16 +395,16 @@ OxygenOffice
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.5
+ BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
+ ABOUTBOXPRODUCTVERSION 3.6.0
+ BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
@@ -414,7 +414,7 @@ OxygenOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.0
+ PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -458,16 +458,16 @@ OxygenOffice_wJRE
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3.5
+ BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
+ ABOUTBOXPRODUCTVERSION 3.6.0
+ BASEPRODUCTVERSION 3.6
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -476,7 +476,7 @@ OxygenOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.0
+ PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index c4403f37ae39..2a98e4c8fe80 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
-RSCVERSION=350
-RSCREVISION=350m1(Build:0)
+RSCVERSION=360
+RSCREVISION=360m1(Build:0)
BUILD=0
LAST_MINOR=m1
-SOURCEVERSION=OOO350
+SOURCEVERSION=OOO360
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index fb561bde9cdc..f56ebedf5057 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.5
+PRODUCTVERSION = 3.6
PRODUCTVERSIONSHORT = 3