This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new aa35365 Bump rev to 4.1.12
aa35365 is described below
commit aa35365212f5f12cc5a56063f7340e9a2aa39f4c
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Oct 8 21:58:47 2021 +0200
Bump rev to 4.1.12
---
main/instsetoo_native/util/openoffice.lst | 50 +++++++++++-----------
main/odk/util/makefile.pmk | 2 +-
.../source/win32/nsis/downloadtemplate.nsi | 2 +-
main/solenv/bin/srcrelease.xml | 2 +-
main/solenv/inc/minor.mk | 8 ++--
main/sysui/desktop/productversion.mk | 2 +-
6 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/main/instsetoo_native/util/openoffice.lst
b/main/instsetoo_native/util/openoffice.lst
index 3f0bb86..3e26e12 100644
--- a/main/instsetoo_native/util/openoffice.lst
+++ b/main/instsetoo_native/util/openoffice.lst
@@ -6,8 +6,8 @@ Globals
{
APACHEPROJECTNAME Apache OpenOffice
OOOBASEVERSION 4.1
- OOOPACKAGEVERSION 4.1.11
- UREPACKAGEVERSION 4.1.11
+ OOOPACKAGEVERSION 4.1.12
+ UREPACKAGEVERSION 4.1.12
URELAYERVERSION 1
BASISROOTNAME OpenOffice
UNIXBASISROOTNAME openoffice
@@ -59,8 +59,8 @@ Apache_OpenOffice
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.1.11
- PREVIOUS_VERSION 4.1.10
+ PRODUCTVERSION 4.1.12
+ PREVIOUS_VERSION 4.1.11
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -68,15 +68,15 @@ Apache_OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.1.11
+ ABOUTBOXPRODUCTVERSION 4.1.12
BASEPRODUCTVERSION 4.1
PCPFILENAME openoffice.pcp
- UPDATEURL https://ooo-updates.apache.org/aoo4111/check.Update
+ UPDATEURL https://ooo-updates.apache.org/aoo4112/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.1.11
+ PACKAGEVERSION 4.1.12
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -120,7 +120,7 @@ Apache_OpenOffice_wJRE
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.1.11
+ PRODUCTVERSION 4.1.12
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -128,14 +128,14 @@ Apache_OpenOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.1.11
+ ABOUTBOXPRODUCTVERSION 4.1.12
BASEPRODUCTVERSION 4.1
- UPDATEURL https://ooo-updates.apache.org/aoo4111/check.Update
+ UPDATEURL https://ooo-updates.apache.org/aoo4112/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.1.11
+ PACKAGEVERSION 4.1.12
PACKAGEREVISION {milestone}
LICENSENAME ALv2
WITHJREPRODUCT 1
@@ -180,7 +180,7 @@ Apache_OpenOffice_Dev
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.1.11
+ PRODUCTVERSION 4.1.12
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -190,17 +190,17 @@ Apache_OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.1.11
+ ABOUTBOXPRODUCTVERSION 4.1.12
BASEPRODUCTVERSION 4.1
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
- UPDATEURL https://ooo-updates.apache.org/aoo4111/check.Update
+ UPDATEURL https://ooo-updates.apache.org/aoo4112/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
- PACKAGEVERSION 4.1.11
+ PACKAGEVERSION 4.1.12
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -251,14 +251,14 @@ Apache_OpenOffice_SDK
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
PRODUCTDIRNAME OpenOffice_SDK
- PRODUCTVERSION 4.1.11
+ PRODUCTVERSION 4.1.12
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.1.11
+ PACKAGEVERSION 4.1.12
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -299,13 +299,13 @@ Apache_OpenOffice_Beta_SDK
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
PRODUCTDIRNAME OpenOffice_SDK_Beta
- PRODUCTVERSION 4.1.11
+ PRODUCTVERSION 4.1.12
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.1.11
+ PACKAGEVERSION 4.1.12
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -345,7 +345,7 @@ Apache_OpenOffice_Dev_SDK
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.1.11
+ PRODUCTVERSION 4.1.12
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -354,7 +354,7 @@ Apache_OpenOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.1.11
+ PACKAGEVERSION 4.1.12
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -398,7 +398,7 @@ Apache_OpenOffice_Beta
{
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
- PRODUCTVERSION 4.1.11
+ PRODUCTVERSION 4.1.12
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
BASISROOTNAME AOOBeta
@@ -408,14 +408,14 @@ Apache_OpenOffice_Beta
POSTVERSIONEXTENSION
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.1.11
+ ABOUTBOXPRODUCTVERSION 4.1.12
BASEPRODUCTVERSION 4.1
- UPDATEURL https://ooo-updates.apache.org/aoo4111/check.Update
+ UPDATEURL https://ooo-updates.apache.org/aoo4112/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 0
EVAL
- PACKAGEVERSION 4.1.11
+ PACKAGEVERSION 4.1.12
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
diff --git a/main/odk/util/makefile.pmk b/main/odk/util/makefile.pmk
index d0e8ab3..dc049d0 100644
--- a/main/odk/util/makefile.pmk
+++ b/main/odk/util/makefile.pmk
@@ -22,7 +22,7 @@
# used for sdk common files
-PRODUCT_RELEASE=4.1.11
+PRODUCT_RELEASE=4.1.12
OFFICENAME=OpenOffice
.IF "$(GUI)"=="WNT"
SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
diff --git a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
index f6fb255..7792664 100644
--- a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -9,7 +9,7 @@ VIAddVersionKey CompanyName "Apache Software Foundation"
VIAddVersionKey LegalCopyright "(c) 2012-2021 The Apache Software Foundation"
VIAddVersionKey FileDescription "Apache PRODUCTNAMEPLACEHOLDER Installer"
VIAddVersionKey ProductVersion "PRODUCTVERSIONPLACEHOLDER"
-VIProductVersion "4.1.9808.500"
+VIProductVersion "4.1.9809.500"
; Enable Unicode
Unicode true
diff --git a/main/solenv/bin/srcrelease.xml b/main/solenv/bin/srcrelease.xml
index b2917f7..4b083d4 100644
--- a/main/solenv/bin/srcrelease.xml
+++ b/main/solenv/bin/srcrelease.xml
@@ -27,7 +27,7 @@
<property name="out.dir" value="."/>
<property name="aoo.name" value="apache-openoffice"/>
<property name="aoo.short.name" value="aoo"/>
- <property name="aoo.ver" value="4.1.11"/>
+ <property name="aoo.ver" value="4.1.12"/>
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn
**/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log,
config.parms, config.status, bootstrap, autom4te.cache/**, LinuxX86Env.*,
LinuxX86-64Env.*, MacOSXX86Env.*, MacOSXX64Env.*, winmingw.*, winenv.*,
external/unowinreg/unowinreg.dll" />
<property name="excludes.executables"
value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize,
solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn,
solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate,
solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe,
configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
diff --git a/main/solenv/inc/minor.mk b/main/solenv/inc/minor.mk
index 4734d68..80a2515 100644
--- a/main/solenv/inc/minor.mk
+++ b/main/solenv/inc/minor.mk
@@ -18,8 +18,8 @@
# under the License.
#
# *************************************************************
-RSCVERSION=4111
-RSCREVISION=4111m1(Build:9808)
-BUILD=9808
+RSCVERSION=4112
+RSCREVISION=4112m1(Build:9809)
+BUILD=9809
LAST_MINOR=m1
-SOURCEVERSION=AOO4111
+SOURCEVERSION=AOO4112
diff --git a/main/sysui/desktop/productversion.mk
b/main/sysui/desktop/productversion.mk
index bbde1c7..355d6e4 100644
--- a/main/sysui/desktop/productversion.mk
+++ b/main/sysui/desktop/productversion.mk
@@ -48,7 +48,7 @@ PRODUCTLIST = openoffice
# default values to minimize maintenance effort
# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.1.11
+PRODUCTVERSION = 4.1.12
# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
PRODUCTVERSIONSHORT = 4
