Author: jsc
Date: Thu Jun 12 14:59:17 2014
New Revision: 1602195
URL: http://svn.apache.org/r1602195
Log:
#125084# update version number for AOO 4.1.1
Modified:
openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst
openoffice/branches/AOO410/main/odk/util/makefile.pmk
openoffice/branches/AOO410/main/solenv/inc/minor.mk
Modified: openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst?rev=1602195&r1=1602194&r2=1602195&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst
(original)
+++ openoffice/branches/AOO410/main/instsetoo_native/util/openoffice.lst Thu
Jun 12 14:59:17 2014
@@ -6,8 +6,8 @@ Globals
{
APACHEPROJECTNAME Apache OpenOffice
OOOBASEVERSION 4.1
- OOOPACKAGEVERSION 4.1.0
- UREPACKAGEVERSION 4.1.0
+ OOOPACKAGEVERSION 4.1.1
+ UREPACKAGEVERSION 4.1.1
URELAYERVERSION 1
BASISROOTNAME OpenOffice
UNIXBASISROOTNAME openoffice
@@ -59,7 +59,7 @@ Apache_OpenOffice
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.1.0
+ PRODUCTVERSION 4.1.1
PREVIOUS_VERSION 4.0.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -68,7 +68,7 @@ Apache_OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.1.0
+ ABOUTBOXPRODUCTVERSION 4.1.1
BASEPRODUCTVERSION 4.1
PCPFILENAME openoffice.pcp
UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
@@ -76,7 +76,7 @@ Apache_OpenOffice
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.1.0
+ PACKAGEVERSION 4.1.1
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -120,7 +120,7 @@ Apache_OpenOffice_wJRE
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.1.0
+ PRODUCTVERSION 4.1.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -128,14 +128,14 @@ Apache_OpenOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.1.0
+ ABOUTBOXPRODUCTVERSION 4.1.1
BASEPRODUCTVERSION 4.1
UPDATEURL https://ooo-updates.apache.org/aoo410/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.0
+ PACKAGEVERSION 4.1.1
PACKAGEREVISION {milestone}
LICENSENAME ALv2
WITHJREPRODUCT 1
@@ -180,7 +180,7 @@ Apache_OpenOffice_Dev
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.1.0
+ PRODUCTVERSION 4.1.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -190,7 +190,7 @@ Apache_OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.1.0
+ ABOUTBOXPRODUCTVERSION 4.1.1
BASEPRODUCTVERSION 4.1
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX aoodev
@@ -200,7 +200,7 @@ Apache_OpenOffice_Dev
UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
- PACKAGEVERSION 4.1.0
+ PACKAGEVERSION 4.1.1
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.0
+ PRODUCTVERSION 4.1.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.1.0
+ PACKAGEVERSION 4.1.1
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.0
+ PRODUCTVERSION 4.1.1
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.1.0
+ PACKAGEVERSION 4.1.1
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.0
+ PRODUCTVERSION 4.1.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -354,7 +354,7 @@ Apache_OpenOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.1.0
+ PACKAGEVERSION 4.1.1
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -398,7 +398,7 @@ Apache_OpenOffice_Beta
{
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
- PRODUCTVERSION 4.1.0
+ PRODUCTVERSION 4.1.1
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
BASISROOTNAME AOOBeta
@@ -408,14 +408,14 @@ Apache_OpenOffice_Beta
POSTVERSIONEXTENSION
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.1.0
+ ABOUTBOXPRODUCTVERSION 4.1.1
BASEPRODUCTVERSION 4.1
UPDATEURL https://ooo-updates.apache.org/aoo410/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.0
+ PACKAGEVERSION 4.1.1
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
Modified: openoffice/branches/AOO410/main/odk/util/makefile.pmk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/odk/util/makefile.pmk?rev=1602195&r1=1602194&r2=1602195&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/odk/util/makefile.pmk (original)
+++ openoffice/branches/AOO410/main/odk/util/makefile.pmk Thu Jun 12 14:59:17
2014
@@ -22,7 +22,7 @@
# used for sdk common files
-PRODUCT_RELEASE=4.1
+PRODUCT_RELEASE=4.1.1
OFFICENAME=OpenOffice
.IF "$(GUI)"=="WNT"
SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
Modified: openoffice/branches/AOO410/main/solenv/inc/minor.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/inc/minor.mk?rev=1602195&r1=1602194&r2=1602195&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/inc/minor.mk (original)
+++ openoffice/branches/AOO410/main/solenv/inc/minor.mk Thu Jun 12 14:59:17 2014
@@ -18,8 +18,8 @@
# under the License.
#
# *************************************************************
-RSCVERSION=410
-RSCREVISION=410m18(Build:9764)
-BUILD=9764
-LAST_MINOR=m18
-SOURCEVERSION=AOO410
+RSCVERSION=411
+RSCREVISION=411m1(Build:9770)
+BUILD=9770
+LAST_MINOR=m1
+SOURCEVERSION=AOO411
