Author: jsc
Date: Fri Nov 1 16:18:51 2013
New Revision: 1537973
URL: http://svn.apache.org/r1537973
Log:
increase version number (4.1.0) to differentiate trunk from the released 4.0.1
version
Modified:
openoffice/trunk/main/instsetoo_native/util/openoffice.lst
openoffice/trunk/main/odk/util/makefile.pmk
Modified: openoffice/trunk/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst?rev=1537973&r1=1537972&r2=1537973&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst Fri Nov 1
16:18:51 2013
@@ -5,9 +5,9 @@ Globals
variables
{
APACHEPROJECTNAME Apache OpenOffice
- OOOBASEVERSION 4.0
- OOOPACKAGEVERSION 4.0.0
- UREPACKAGEVERSION 4.0.0
+ OOOBASEVERSION 4.1
+ OOOPACKAGEVERSION 4.1.0
+ UREPACKAGEVERSION 4.1.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice
UNIXBASISROOTNAME openoffice
@@ -41,9 +41,9 @@ Globals
OOOXMLFILEFORMATNAME OpenOffice.org XML
OOOXMLFILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- SERVICETAG_PRODUCTNAME Apache OpenOffice 4.0
- SERVICETAG_PRODUCTVERSION 4.0
- SERVICETAG_PARENTNAME Apache OpenOffice 4.0
+ SERVICETAG_PRODUCTNAME Apache OpenOffice 4.1
+ SERVICETAG_PRODUCTVERSION 4.1
+ SERVICETAG_PARENTNAME Apache OpenOffice 4.1
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
REGISTRATION_HOST https://registration.openoffice.org
@@ -61,7 +61,7 @@ Apache_OpenOffice
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -69,15 +69,15 @@ Apache_OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0
- BASEPRODUCTVERSION 4.0
+ ABOUTBOXPRODUCTVERSION 4.1.0
+ BASEPRODUCTVERSION 4.1
PCPFILENAME openoffice.pcp
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 1
EVAL
- PACKAGEVERSION 4.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -121,7 +121,7 @@ Apache_OpenOffice_wJRE
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -129,14 +129,14 @@ Apache_OpenOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0
- BASEPRODUCTVERSION 4.0
+ ABOUTBOXPRODUCTVERSION 4.1.0
+ 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.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
WITHJREPRODUCT 1
@@ -181,7 +181,7 @@ Apache_OpenOffice_Dev
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -191,8 +191,8 @@ Apache_OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0
- BASEPRODUCTVERSION 4.0
+ ABOUTBOXPRODUCTVERSION 4.1.0
+ BASEPRODUCTVERSION 4.1
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -201,7 +201,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.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -250,8 +250,8 @@ URE
{
FULLPRODUCTNAME URE
PRODUCTNAME URE
- PRODUCTVERSION 4.0.0
- PACKAGEVERSION 4.0
+ PRODUCTVERSION 4.1.0
+ PACKAGEVERSION 4.1
PACKAGEREVISION 1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -293,14 +293,14 @@ Apache_OpenOffice_SDK
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -341,7 +341,7 @@ Apache_OpenOffice_Dev_SDK
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -350,7 +350,7 @@ Apache_OpenOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
Modified: openoffice/trunk/main/odk/util/makefile.pmk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/util/makefile.pmk?rev=1537973&r1=1537972&r2=1537973&view=diff
==============================================================================
--- openoffice/trunk/main/odk/util/makefile.pmk (original)
+++ openoffice/trunk/main/odk/util/makefile.pmk Fri Nov 1 16:18:51 2013
@@ -22,7 +22,7 @@
# used for sdk common files
-PRODUCT_RELEASE=4.0
+PRODUCT_RELEASE=4.1
OFFICENAME=OpenOffice
.IF "$(GUI)"=="WNT"
SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
