openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [openoffice] branch AOO418 updated: Bump up for AOO418
Date Wed, 25 Sep 2019 17:52:27 GMT
This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO418 by this push:
     new 02781d6  Bump up for AOO418
02781d6 is described below

commit 02781d68bab60426ed276312d9d2b4dfe74a6e52
Author: Jim Jagielski <jimjag@gmail.com>
AuthorDate: Wed Sep 25 13:52:11 2019 -0400

    Bump up for AOO418
---
 main/instsetoo_native/util/openoffice.lst | 50 +++++++++++++++----------------
 main/odk/util/makefile.pmk                |  2 +-
 main/solenv/bin/srcrelease.xml            |  2 +-
 main/solenv/inc/minor.mk                  |  8 ++---
 main/sysui/desktop/productversion.mk      |  2 +-
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/main/instsetoo_native/util/openoffice.lst b/main/instsetoo_native/util/openoffice.lst
index faeadf8..004c619 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.7
-            UREPACKAGEVERSION 4.1.7
+            OOOPACKAGEVERSION 4.1.8
+            UREPACKAGEVERSION 4.1.8
             URELAYERVERSION 1
             BASISROOTNAME OpenOffice
             UNIXBASISROOTNAME openoffice
@@ -59,8 +59,8 @@ Apache_OpenOffice
         {
             FULLPRODUCTNAME Apache OpenOffice
             PRODUCTNAME OpenOffice
-            PRODUCTVERSION 4.1.7
-            PREVIOUS_VERSION 4.1.6
+            PRODUCTVERSION 4.1.8
+            PREVIOUS_VERSION 4.1.7
             PRODUCTEXTENSION 
             LONG_PRODUCTEXTENSION 
             SHORT_PRODUCTEXTENSION 
@@ -68,15 +68,15 @@ Apache_OpenOffice
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4
             USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.1.7
+            ABOUTBOXPRODUCTVERSION 4.1.8
             BASEPRODUCTVERSION 4.1
             PCPFILENAME openoffice.pcp
-            UPDATEURL https://ooo-updates.apache.org/aoo417/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoo418/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.7
+            PACKAGEVERSION 4.1.8
             PACKAGEREVISION {milestone}
             LICENSENAME ALv2
             GLOBALFILEGID gid_File_Lib_Vcl
@@ -120,7 +120,7 @@ Apache_OpenOffice_wJRE
         {
             FULLPRODUCTNAME Apache OpenOffice
             PRODUCTNAME OpenOffice
-            PRODUCTVERSION 4.1.7
+            PRODUCTVERSION 4.1.8
             PRODUCTEXTENSION 
             LONG_PRODUCTEXTENSION 
             SHORT_PRODUCTEXTENSION 
@@ -128,14 +128,14 @@ Apache_OpenOffice_wJRE
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4
             USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.1.7
+            ABOUTBOXPRODUCTVERSION 4.1.8
             BASEPRODUCTVERSION 4.1
-            UPDATEURL https://ooo-updates.apache.org/aoo417/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoo418/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.7
+            PACKAGEVERSION 4.1.8
             PACKAGEREVISION {milestone}
             LICENSENAME ALv2
             WITHJREPRODUCT 1
@@ -180,7 +180,7 @@ Apache_OpenOffice_Dev
         {
             FULLPRODUCTNAME AOO-Developer-Build
             PRODUCTNAME AOO-Developer-Build
-            PRODUCTVERSION 4.1.7
+            PRODUCTVERSION 4.1.8
             PRODUCTEXTENSION 
             LONG_PRODUCTEXTENSION 
             SHORT_PRODUCTEXTENSION 
@@ -190,17 +190,17 @@ Apache_OpenOffice_Dev
             POSTVERSIONEXTENSIONUNIX
             BRANDPACKAGEVERSION 4
             USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.1.7
+            ABOUTBOXPRODUCTVERSION 4.1.8
             BASEPRODUCTVERSION 4.1
             DEVELOPMENTPRODUCT 1
             BASISPACKAGEPREFIX aoodev
             UREPACKAGEPREFIX aoodev
             SOLSUREPACKAGEPREFIX aoodev
             REGISTRYLAYERNAME LayerDev
-            UPDATEURL https://ooo-updates.apache.org/aoo417/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoo418/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
             EVAL
-            PACKAGEVERSION 4.1.7
+            PACKAGEVERSION 4.1.8
             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.7
+            PRODUCTVERSION 4.1.8
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 4
-            PACKAGEVERSION 4.1.7
+            PACKAGEVERSION 4.1.8
             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.7
+            PRODUCTVERSION 4.1.8
             PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 4
-            PACKAGEVERSION 4.1.7
+            PACKAGEVERSION 4.1.8
             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.7
+            PRODUCTVERSION 4.1.8
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
@@ -354,7 +354,7 @@ Apache_OpenOffice_Dev_SDK
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 4
-            PACKAGEVERSION 4.1.7
+            PACKAGEVERSION 4.1.8
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX aoodev
             UREPACKAGEPREFIX aoodev
@@ -398,7 +398,7 @@ Apache_OpenOffice_Beta
         {
             FULLPRODUCTNAME Apache OpenOffice Beta
             PRODUCTNAME OpenOffice Beta
-            PRODUCTVERSION 4.1.7
+            PRODUCTVERSION 4.1.8
             PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             BASISROOTNAME AOOBeta
@@ -408,14 +408,14 @@ Apache_OpenOffice_Beta
             POSTVERSIONEXTENSION
             BRANDPACKAGEVERSION 4
             USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.1.7
+            ABOUTBOXPRODUCTVERSION 4.1.8
             BASEPRODUCTVERSION 4.1
-            UPDATEURL https://ooo-updates.apache.org/aoo417/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoo418/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.7
+            PACKAGEVERSION 4.1.8
             PACKAGEREVISION {milestone}
             LICENSENAME ALv2
             GLOBALFILEGID gid_File_Lib_Vcl
diff --git a/main/odk/util/makefile.pmk b/main/odk/util/makefile.pmk
index 364fab4..003214e 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.7
+PRODUCT_RELEASE=4.1.8
 OFFICENAME=OpenOffice
 .IF "$(GUI)"=="WNT"
 SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
diff --git a/main/solenv/bin/srcrelease.xml b/main/solenv/bin/srcrelease.xml
index 9f7166b..1635baf 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.7"/>
+  <property name="aoo.ver" value="4.1.8"/>
 
   <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 600768a..4f31cfe 100644
--- a/main/solenv/inc/minor.mk
+++ b/main/solenv/inc/minor.mk
@@ -18,8 +18,8 @@
 #  under the License.
 #
 # *************************************************************
-RSCVERSION=417
-RSCREVISION=417m1(Build:9800)
-BUILD=9800
+RSCVERSION=418
+RSCREVISION=418m1(Build:9801)
+BUILD=9801
 LAST_MINOR=m1
-SOURCEVERSION=AOO417
+SOURCEVERSION=AOO418
diff --git a/main/sysui/desktop/productversion.mk b/main/sysui/desktop/productversion.mk
index 5e36080..fe61a56 100644
--- a/main/sysui/desktop/productversion.mk
+++ b/main/sysui/desktop/productversion.mk
@@ -47,7 +47,7 @@ PRODUCTLIST = openoffice
 # default values to minimize maintainance effort
 
 # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.1.7
+PRODUCTVERSION = 4.1.8
 
 # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
 PRODUCTVERSIONSHORT = 4


Mime
View raw message