[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - helpcontent2 instsetoo_native/util solenv/inc
Christian Lohmaier
lohmaier+LibreOffice at googlemail.com
Tue Oct 1 09:41:10 PDT 2013
helpcontent2 | 2 -
instsetoo_native/util/openoffice.lst | 40 +++++++++++++++++------------------
solenv/inc/minor.mk | 2 -
3 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 20496991d00e62a2cb27ecaf77ed2c29646a23c1
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Tue Oct 1 18:28:19 2013 +0200
bump product version to 4.0.7.0+, reset number to 0
Change-Id: I19edf97ee1e4011c953cac7c63acb0c2ce4e8559
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index e9d726c..14fa7e0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
- UREPACKAGEVERSION 4.0.6.0
+ UREPACKAGEVERSION 4.0.7.0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION .6.0
+ PRODUCTEXTENSION .7.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.6.0
+ ABOUTBOXPRODUCTVERSION 4.0.7.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 4.0.6.0
+ PACKAGEVERSION 4.0.7.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION .6.0
+ PRODUCTEXTENSION .7.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.6.0
+ ABOUTBOXPRODUCTVERSION 4.0.7.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 4.0.6.0
+ PACKAGEVERSION 4.0.7.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
- PACKAGEVERSION 4.0.6.0
+ PACKAGEVERSION 4.0.7.0
PACKAGEREVISION 1
- PRODUCTEXTENSION .6.0
+ PRODUCTEXTENSION .7.0
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION .6.0
+ PRODUCTEXTENSION .7.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
- PACKAGEVERSION 4.0.6.0
+ PACKAGEVERSION 4.0.7.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION .6.0
+ PRODUCTEXTENSION .7.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
- PACKAGEVERSION 4.0.6.0
+ PACKAGEVERSION 4.0.7.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION .6.0
+ PRODUCTEXTENSION .7.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
- PACKAGEVERSION 4.0.6.0
+ PACKAGEVERSION 4.0.7.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
- PRODUCTEXTENSION .6.0
+ PRODUCTEXTENSION .7.0
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
- PACKAGEVERSION 4.0.6.0
+ PACKAGEVERSION 4.0.7.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -359,12 +359,12 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
- PRODUCTEXTENSION .6.0
+ PRODUCTEXTENSION .7.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.6.0
+ ABOUTBOXPRODUCTVERSION 4.0.7.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
@@ -374,7 +374,7 @@ OxygenOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 4.0.6.0
+ PACKAGEVERSION 4.0.7.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index d60707f..1b640a8 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -6,6 +6,6 @@ SOURCEVERSION=OOO400
VERSIONMAJOR=4
VERSIONMINOR=0
-VERSIONMICRO=6
+VERSIONMICRO=7
COPYRIGHTYEARRANGE=2000-2013
commit 4500d5b3c0867b8d3416ef4a61ef059da64b61fc
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Tue Oct 1 18:11:14 2013 +0200
bring helpcontent2 to libreoffice-4-0 branch
Change-Id: I0aaa58ba4ac11d56a2ea8203bf16c3f4c782d2dc
diff --git a/helpcontent2 b/helpcontent2
index 0d8b37c..e15ec69 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
+Subproject commit e15ec6915ca8837f68fc1b1133d6380f087f81c0
More information about the Libreoffice-commits
mailing list