mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump version to 3.6 (3.6.0, 360, 360m1)

Browse Source
This commit is contained in:
Tor Lillqvist
2011-12-08 21:13:48 +02:00
parent 52422457d4
commit bbc6099213
4 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@@ -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 configure.in serves as input for the GNU autoconf package
dnl in order to create a configure script. 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]) AC_PREREQ([2.59])
save_CC=$CC save_CC=$CC

86
instsetoo_native/util/openoffice.lst
View File

@@ -4,13 +4,13 @@ Globals
{ {
variables variables
{ {
UREPACKAGEVERSION 3.5.0 UREPACKAGEVERSION 3.6.0
URELAYERVERSION 1 URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5 UNIXBASISROOTNAME libreoffice3.6
SERVICETAG_PRODUCTNAME LibreOffice 3.5 SERVICETAG_PRODUCTNAME LibreOffice 3.6
SERVICETAG_PRODUCTVERSION 3.5 SERVICETAG_PRODUCTVERSION 3.6
SERVICETAG_PARENTNAME LibreOffice 3.5 SERVICETAG_PARENTNAME LibreOffice 3.6
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid}) SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93 SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1 HIDELICENSEDIALOG 1
@@ -50,16 +50,16 @@ LibreOffice
variables variables
{ {
PRODUCTNAME LibreOffice PRODUCTNAME LibreOffice
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0 SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3 USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0 ABOUTBOXPRODUCTVERSION 3.6.0
BASEPRODUCTVERSION 3.5 BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
@@ -69,7 +69,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0 FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.5.0 PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
@@ -108,17 +108,17 @@ LibreOffice_Dev
variables variables
{ {
PRODUCTNAME LOdev PRODUCTNAME LOdev
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0 SHORT_PRODUCTEXTENSION beta0
UNIXBASISROOTNAME lodev3.5 UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3 USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0 ABOUTBOXPRODUCTVERSION 3.6.0
BASEPRODUCTVERSION 3.5 BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1 DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev UREPACKAGEPREFIX lodev
@@ -132,7 +132,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0 FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.5.0 PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
@@ -174,11 +174,11 @@ URE
variables variables
{ {
PRODUCTNAME URE PRODUCTNAME URE
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PACKAGEVERSION 3.5 PACKAGEVERSION 3.6
PACKAGEREVISION 1 PACKAGEREVISION 1
PRODUCTEXTENSION PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0 SHORT_PRODUCTEXTENSION beta0
LICENSENAME LGPL LICENSENAME LGPL
@@ -212,14 +212,14 @@ LibreOffice_SDK
variables variables
{ {
PRODUCTNAME LibreOffice PRODUCTNAME LibreOffice
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0 SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
PACKAGEVERSION 3.5.0 PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
PACK_INSTALLED 1 PACK_INSTALLED 1
POOLPRODUCT 0 POOLPRODUCT 0
@@ -255,15 +255,15 @@ LibreOffice_Dev_SDK
variables variables
{ {
PRODUCTNAME LOdev PRODUCTNAME LOdev
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0 SHORT_PRODUCTEXTENSION beta0
UNIXBASISROOTNAME lodev3.5 UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
PACKAGEVERSION 3.5.0 PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev UREPACKAGEPREFIX lodev
@@ -304,14 +304,14 @@ LibreOffice_Test
variables variables
{ {
PRODUCTNAME LibreOffice PRODUCTNAME LibreOffice
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION alpha0 SHORT_PRODUCTEXTENSION alpha0
POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
PACKAGEVERSION 3.5.0 PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
PACK_INSTALLED 1 PACK_INSTALLED 1
POOLPRODUCT 0 POOLPRODUCT 0
@@ -347,15 +347,15 @@ LibreOffice_Dev_Test
variables variables
{ {
PRODUCTNAME LOdev PRODUCTNAME LOdev
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION alpha0 SHORT_PRODUCTEXTENSION alpha0
UNIXBASISROOTNAME lodev3.5 UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
PACKAGEVERSION 3.5.0 PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev UREPACKAGEPREFIX lodev
@@ -395,16 +395,16 @@ OxygenOffice
variables variables
{ {
PRODUCTNAME OxygenOffice PRODUCTNAME OxygenOffice
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0 SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3 USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0 ABOUTBOXPRODUCTVERSION 3.6.0
BASEPRODUCTVERSION 3.5 BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
@@ -414,7 +414,7 @@ OxygenOffice
FILEFORMATNAME OpenOffice.org FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0 FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.5.0 PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
SERVICESPROJEKT 1 SERVICESPROJEKT 1
@@ -458,16 +458,16 @@ OxygenOffice_wJRE
variables variables
{ {
PRODUCTNAME OxygenOffice PRODUCTNAME OxygenOffice
PRODUCTVERSION 3.5 PRODUCTVERSION 3.6
PRODUCTEXTENSION PRODUCTEXTENSION
LONG_PRODUCTEXTENSION LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta0 SHORT_PRODUCTEXTENSION beta0
POSTVERSIONEXTENSION POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5 BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3 USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0 ABOUTBOXPRODUCTVERSION 3.6.0
BASEPRODUCTVERSION 3.5 BASEPRODUCTVERSION 3.6
UPDATEURL http://update.libreoffice.org/check.php UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -476,7 +476,7 @@ OxygenOffice_wJRE
FILEFORMATNAME OpenOffice.org FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0 FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.5.0 PACKAGEVERSION 3.6.0
PACKAGEREVISION {buildid} PACKAGEREVISION {buildid}
LICENSENAME LGPL LICENSENAME LGPL
SERVICESPROJEKT 1 SERVICESPROJEKT 1

6
solenv/inc/minor.mk
View File

@@ -1,5 +1,5 @@
RSCVERSION=350 RSCVERSION=360
RSCREVISION=350m1(Build:0) RSCREVISION=360m1(Build:0)
BUILD=0 BUILD=0
LAST_MINOR=m1 LAST_MINOR=m1
SOURCEVERSION=OOO350 SOURCEVERSION=OOO360

2
solenv/inc/productversion.mk
View File

@@ -28,5 +28,5 @@
PRODUCTLIST = libreoffice lodev oxygenoffice PRODUCTLIST = libreoffice lodev oxygenoffice
# default values to minimize maintainance effort # default values to minimize maintainance effort
PRODUCTVERSION = 3.5 PRODUCTVERSION = 3.6
PRODUCTVERSIONSHORT = 3 PRODUCTVERSIONSHORT = 3