Author: mseidel Date: Tue Aug 28 09:44:24 2018 New Revision: 1839420 URL: http://svn.apache.org/viewvc?rev=1839420&view=rev Log: Bump up version number to 4.1.6
Modified: openoffice/branches/AOO416/main/instsetoo_native/util/openoffice.lst openoffice/branches/AOO416/main/odk/util/makefile.pmk openoffice/branches/AOO416/main/solenv/bin/srcrelease.xml openoffice/branches/AOO416/main/solenv/inc/minor.mk openoffice/branches/AOO416/main/sysui/desktop/productversion.mk Modified: openoffice/branches/AOO416/main/instsetoo_native/util/openoffice.lst URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/instsetoo_native/util/openoffice.lst?rev=1839420&r1=1839419&r2=1839420&view=diff ============================================================================== --- openoffice/branches/AOO416/main/instsetoo_native/util/openoffice.lst (original) +++ openoffice/branches/AOO416/main/instsetoo_native/util/openoffice.lst Tue Aug 28 09:44:24 2018 @@ -6,8 +6,8 @@ Globals { APACHEPROJECTNAME Apache OpenOffice OOOBASEVERSION 4.1 - OOOPACKAGEVERSION 4.1.5 - UREPACKAGEVERSION 4.1.5 + OOOPACKAGEVERSION 4.1.6 + UREPACKAGEVERSION 4.1.6 URELAYERVERSION 1 BASISROOTNAME OpenOffice UNIXBASISROOTNAME openoffice @@ -59,8 +59,8 @@ Apache_OpenOffice { FULLPRODUCTNAME Apache OpenOffice PRODUCTNAME OpenOffice - PRODUCTVERSION 4.1.5 - PREVIOUS_VERSION 4.1.4 + PRODUCTVERSION 4.1.6 + PREVIOUS_VERSION 4.1.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -68,15 +68,15 @@ Apache_OpenOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4 USERDIRPRODUCTVERSION 4 - ABOUTBOXPRODUCTVERSION 4.1.5 + ABOUTBOXPRODUCTVERSION 4.1.6 BASEPRODUCTVERSION 4.1 PCPFILENAME openoffice.pcp - UPDATEURL https://ooo-updates.apache.org/aoo415/check.Update + UPDATEURL https://ooo-updates.apache.org/aoo416/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.5 + PACKAGEVERSION 4.1.6 PACKAGEREVISION {milestone} LICENSENAME ALv2 GLOBALFILEGID gid_File_Lib_Vcl @@ -120,7 +120,7 @@ Apache_OpenOffice_wJRE { FULLPRODUCTNAME Apache OpenOffice PRODUCTNAME OpenOffice - PRODUCTVERSION 4.1.5 + PRODUCTVERSION 4.1.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -128,14 +128,14 @@ Apache_OpenOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4 USERDIRPRODUCTVERSION 4 - ABOUTBOXPRODUCTVERSION 4.1.5 + ABOUTBOXPRODUCTVERSION 4.1.6 BASEPRODUCTVERSION 4.1 - UPDATEURL https://ooo-updates.apache.org/aoo415/check.Update + UPDATEURL https://ooo-updates.apache.org/aoo416/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.5 + PACKAGEVERSION 4.1.6 PACKAGEREVISION {milestone} LICENSENAME ALv2 WITHJREPRODUCT 1 @@ -180,7 +180,7 @@ Apache_OpenOffice_Dev { FULLPRODUCTNAME AOO-Developer-Build PRODUCTNAME AOO-Developer-Build - PRODUCTVERSION 4.1.5 + PRODUCTVERSION 4.1.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -190,17 +190,17 @@ Apache_OpenOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4 USERDIRPRODUCTVERSION 4 - ABOUTBOXPRODUCTVERSION 4.1.5 + ABOUTBOXPRODUCTVERSION 4.1.6 BASEPRODUCTVERSION 4.1 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX aoodev UREPACKAGEPREFIX aoodev SOLSUREPACKAGEPREFIX aoodev REGISTRYLAYERNAME LayerDev - UPDATEURL https://ooo-updates.apache.org/aoo415/check.Update + UPDATEURL https://ooo-updates.apache.org/aoo416/check.Update ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst EVAL - PACKAGEVERSION 4.1.5 + PACKAGEVERSION 4.1.6 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.5 + PRODUCTVERSION 4.1.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4 - PACKAGEVERSION 4.1.5 + PACKAGEVERSION 4.1.6 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.5 + PRODUCTVERSION 4.1.6 PRODUCTEXTENSION SHORT_PRODUCTEXTENSION POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4 - PACKAGEVERSION 4.1.5 + PACKAGEVERSION 4.1.6 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.5 + PRODUCTVERSION 4.1.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -354,7 +354,7 @@ Apache_OpenOffice_Dev_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4 - PACKAGEVERSION 4.1.5 + PACKAGEVERSION 4.1.6 PACKAGEREVISION {milestone} BASISPACKAGEPREFIX aoodev UREPACKAGEPREFIX aoodev @@ -398,7 +398,7 @@ Apache_OpenOffice_Beta { FULLPRODUCTNAME Apache OpenOffice Beta PRODUCTNAME OpenOffice Beta - PRODUCTVERSION 4.1.5 + PRODUCTVERSION 4.1.6 PRODUCTEXTENSION SHORT_PRODUCTEXTENSION BASISROOTNAME AOOBeta @@ -408,14 +408,14 @@ Apache_OpenOffice_Beta POSTVERSIONEXTENSION BRANDPACKAGEVERSION 4 USERDIRPRODUCTVERSION 4 - ABOUTBOXPRODUCTVERSION 4.1.5 + ABOUTBOXPRODUCTVERSION 4.1.6 BASEPRODUCTVERSION 4.1 - UPDATEURL https://ooo-updates.apache.org/aoo415/check.Update + UPDATEURL https://ooo-updates.apache.org/aoo416/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.5 + PACKAGEVERSION 4.1.6 PACKAGEREVISION {milestone} LICENSENAME ALv2 GLOBALFILEGID gid_File_Lib_Vcl Modified: openoffice/branches/AOO416/main/odk/util/makefile.pmk URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/odk/util/makefile.pmk?rev=1839420&r1=1839419&r2=1839420&view=diff ============================================================================== --- openoffice/branches/AOO416/main/odk/util/makefile.pmk (original) +++ openoffice/branches/AOO416/main/odk/util/makefile.pmk Tue Aug 28 09:44:24 2018 @@ -22,7 +22,7 @@ # used for sdk common files -PRODUCT_RELEASE=4.1.5 +PRODUCT_RELEASE=4.1.6 OFFICENAME=OpenOffice .IF "$(GUI)"=="WNT" SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK Modified: openoffice/branches/AOO416/main/solenv/bin/srcrelease.xml URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/solenv/bin/srcrelease.xml?rev=1839420&r1=1839419&r2=1839420&view=diff ============================================================================== --- openoffice/branches/AOO416/main/solenv/bin/srcrelease.xml (original) +++ openoffice/branches/AOO416/main/solenv/bin/srcrelease.xml Tue Aug 28 09:44:24 2018 @@ -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.5"/> + <property name="aoo.ver" value="4.1.6"/> <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"/> Modified: openoffice/branches/AOO416/main/solenv/inc/minor.mk URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/solenv/inc/minor.mk?rev=1839420&r1=1839419&r2=1839420&view=diff ============================================================================== --- openoffice/branches/AOO416/main/solenv/inc/minor.mk (original) +++ openoffice/branches/AOO416/main/solenv/inc/minor.mk Tue Aug 28 09:44:24 2018 @@ -18,8 +18,8 @@ # under the License. # # ************************************************************* -RSCVERSION=415 -RSCREVISION=415m1(Build:9789) -BUILD=9789 +RSCVERSION=416 +RSCREVISION=416m1(Build:9790) +BUILD=9790 LAST_MINOR=m1 -SOURCEVERSION=AOO415 +SOURCEVERSION=AOO416 Modified: openoffice/branches/AOO416/main/sysui/desktop/productversion.mk URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/sysui/desktop/productversion.mk?rev=1839420&r1=1839419&r2=1839420&view=diff ============================================================================== --- openoffice/branches/AOO416/main/sysui/desktop/productversion.mk (original) +++ openoffice/branches/AOO416/main/sysui/desktop/productversion.mk Tue Aug 28 09:44:24 2018 @@ -47,7 +47,7 @@ PRODUCTLIST = openoffice # default values to minimize maintainance effort # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!) -PRODUCTVERSION = 4.1.5 +PRODUCTVERSION = 4.1.6 # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!) PRODUCTVERSIONSHORT = 4