i119977 - Update version number to 4.0.0

f1499b86 · Ariel Constenla-Haile · e95f1d81 · f1499b86 · f1499b86 · f1499b86
Kaydet (Commit) f1499b86 authored Şub 05, 2013 tarafından Ariel Constenla-Haile
26 changed files
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,9 +5,9 @@ Globals
        variables
        {
            APACHEPROJECTNAME Apache OpenOffice
-            OOOBASEVERSION 3.5
-            OOOPACKAGEVERSION 3.5.0
-            UREPACKAGEVERSION 3.5.0
+            OOOBASEVERSION 4.0
+            OOOPACKAGEVERSION 4.0.0
+            UREPACKAGEVERSION 4.0.0
            URELAYERVERSION 1
            BASISROOTNAME ApacheOpenOffice
            UNIXBASISROOTNAME apacheopenoffice
@@ -17,7 +17,7 @@ Globals
            UREPACKAGEPREFIX apacheopenoffice
            SOLSUREPACKAGEPREFIX apacheopenoffice
            USE_FILEVERSION 1
-            LIBRARYVERSION 9.5.0
+            LIBRARYVERSION 10.0.0
            POOLPRODUCT 1
            PROGRESSBARCOLOR 14,133,205
            PROGRESSSIZE 320,7
@@ -40,9 +40,9 @@ Globals
            OOOXMLFILEFORMATNAME OpenOffice.org XML
            OOOXMLFILEFORMATVERSION 1.0
            WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-            SERVICETAG_PRODUCTNAME Apache OpenOffice 3.5
-            SERVICETAG_PRODUCTVERSION 3.5
-            SERVICETAG_PARENTNAME Apache OpenOffice 3.5
+            SERVICETAG_PRODUCTNAME Apache OpenOffice 4.0
+            SERVICETAG_PRODUCTVERSION 4.0
+            SERVICETAG_PARENTNAME Apache OpenOffice 4.0
            SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
            SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
            REGISTRATION_HOST https://registration.openoffice.org
@@ -59,23 +59,23 @@ Apache_OpenOffice
        variables
        {
            PRODUCTNAME Apache OpenOffice
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.5.0
-            BASEPRODUCTVERSION 3.5
+            BRANDPACKAGEVERSION 4
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0
+            BASEPRODUCTVERSION 4.0
            PCPFILENAME openoffice.pcp
-            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+            UPDATEURL http://www.openoffice.org/projects/update/aoo40/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 3.5.0
+            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            GLOBALFILEGID gid_File_Lib_Vcl
@@ -90,7 +90,7 @@ Apache_OpenOffice
            STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
            CHANGETARGETDIR 1
            USE_FILEVERSION 1
-            LIBRARYVERSION 9.5.0
+            LIBRARYVERSION 10.0.0
            PATCHCODEFILE ooo_patchcodes.txt
            DOWNLOADBANNER	ooobanner.bmp
            DOWNLOADBITMAP	ooobitmap.bmp
@@ -118,22 +118,22 @@ Apache_OpenOffice_wJRE
        variables
        {
            PRODUCTNAME Apache OpenOffice
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.5.0
-            BASEPRODUCTVERSION 3.5
-            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+            BRANDPACKAGEVERSION 4
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0
+            BASEPRODUCTVERSION 4.0
+            UPDATEURL http://www.openoffice.org/projects/update/aoo40/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 3.5.0
+            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            WITHJREPRODUCT 1
@@ -149,7 +149,7 @@ Apache_OpenOffice_wJRE
            STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
            CHANGETARGETDIR 1
            USE_FILEVERSION 1
-            LIBRARYVERSION 9.5.0
+            LIBRARYVERSION 10.0.0
            PATCHCODEFILE ooo_patchcodes.txt
            JAVAPRODUCT 1
            DOWNLOADBANNER	ooobanner.bmp
@@ -177,7 +177,7 @@ Apache_OpenOffice_Dev
        variables
        {
            PRODUCTNAME AOO-Developer-Build
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 
@@ -185,19 +185,19 @@ Apache_OpenOffice_Dev
            UNIXBASISROOTNAME aoodev
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 3
-            USERDIRPRODUCTVERSION 3
-            ABOUTBOXPRODUCTVERSION 3.5.0
-            BASEPRODUCTVERSION 3.5
+            BRANDPACKAGEVERSION 4
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.0.0
+            BASEPRODUCTVERSION 4.0
            DEVELOPMENTPRODUCT 1
            BASISPACKAGEPREFIX aoobasis-dev
            UREPACKAGEPREFIX aoodev
            SOLSUREPACKAGEPREFIX aoodev
            REGISTRYLAYERNAME LayerDev
-            UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+            UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
            EVAL
-            PACKAGEVERSION 3.5.0
+            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            GLOBALFILEGID gid_File_Lib_Vcl
@@ -213,7 +213,7 @@ Apache_OpenOffice_Dev
            CHANGETARGETDIR 1
            USE_FILEVERSION 1
            JAVAPRODUCT 0
-            LIBRARYVERSION 9.5.0
+            LIBRARYVERSION 10.0.0
            PATCHCODEFILE ooodev_patchcodes.txt
            CODEFILENAME codes_ooodev.txt
            DOWNLOADBANNER	ooobanner.bmp
@@ -245,8 +245,8 @@ URE
        variables
        {
            PRODUCTNAME URE
-            PRODUCTVERSION 3.5.0
-            PACKAGEVERSION 3.5
+            PRODUCTVERSION 4.0.0
+            PACKAGEVERSION 4.0
            PACKAGEREVISION 1
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION
@@ -287,19 +287,19 @@ Apache_OpenOffice_SDK
        variables
        {
            PRODUCTNAME Apache OpenOffice
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION
            SHORT_PRODUCTEXTENSION
            POSTVERSIONEXTENSION SDK
            POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.5.0
+            BRANDPACKAGEVERSION 4
+            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            PACK_INSTALLED 1
            POOLPRODUCT 0
            DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg34sdk
+            DATABASENAME openofficeorg40sdk
            NO_README_IN_ROOTDIR 1
            LICENSENAME ALv2
            IGNOREDIRECTORYLAYER 1
@@ -334,7 +334,7 @@ Apache_OpenOffice_Dev_SDK
        variables
        {
            PRODUCTNAME AOO-Developer-Build
-            PRODUCTVERSION 3.5.0
+            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION
            SHORT_PRODUCTEXTENSION
@@ -342,8 +342,8 @@ Apache_OpenOffice_Dev_SDK
            UNIXBASISROOTNAME ooo-dev
            POSTVERSIONEXTENSION SDK
            POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.5.0
+            BRANDPACKAGEVERSION 4
+            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            BASISPACKAGEPREFIX aoobasis-dev
            UREPACKAGEPREFIX aoodev
@@ -353,7 +353,7 @@ Apache_OpenOffice_Dev_SDK
            PACK_INSTALLED 1
            POOLPRODUCT 0
            DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg35devsdk
+            DATABASENAME openofficeorg40devsdk
            NO_README_IN_ROOTDIR 1
            LICENSENAME ALv2
            IGNOREDIRECTORYLAYER 1

--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -919,18 +919,18 @@ function writeBatFile(fdir, file)
        "REM are necessary for building the examples of the Office Development Kit.\n" +
        "REM The Script was developed for the operating systems Windows.\n" +
        "REM The SDK name\n" +
-        "REM Example: set OO_SDK_NAME=openoffice3.0_sdk\n" +
+        "REM Example: set OO_SDK_NAME=openoffice4.0_sdk\n" +
        "set OO_SDK_NAME=" + oo_sdk_name  +
        "\n\n" +
        "REM Installation directory of the Software Development Kit.\n" +
-        "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 3.0\\sdk\n" +
+        "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 4.0\\sdk\n" +
        "set OO_SDK_HOME=" + oo_sdk_home  +
        "\n\n" +
        "REM Office installation directory.\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 3\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 4\n" +
        "set OFFICE_HOME=" + office_home +
        "\n\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 3.0\n" +
+        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 4.0\n" +
        "set OFFICE_BASE_HOME=" + office_base_home +
        "\n\n" +
        "REM URE installation directory.\n" +

--- a/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile
+++ b/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile
@@ -135,6 +135,7 @@ $(COMP_UNOPKG_DESCRIPTION) :  xml/description.xml
 	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
 	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
 	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
 	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
 	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
 	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

--- a/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
+++ b/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
@@ -19,8 +19,9 @@
 #
 #**************************************************************

-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice

 EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus
 EXTENSION_VERSION=0.0.1

--- a/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml
+++ b/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml
@@ -25,6 +25,7 @@
    <platform value="#EXTENSION_PLATFORM#"/>
    <dependencies>
        <OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+        <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
    </dependencies>
    <publisher>
        <name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

--- a/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile
+++ b/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile
@@ -133,6 +133,7 @@ $(COMP_UNOPKG_DESCRIPTION) :  xml/description.xml
 	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
 	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
 	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
 	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
 	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
 	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

--- a/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
+++ b/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
@@ -19,8 +19,9 @@
 #
 #**************************************************************

-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice

 EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode
 EXTENSION_VERSION=0.0.1

--- a/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml
+++ b/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml
@@ -25,6 +25,7 @@
    <platform value="#EXTENSION_PLATFORM#"/>
    <dependencies>
        <OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+        <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
    </dependencies>
    <publisher>
        <name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

--- a/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile
+++ b/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile
@@ -149,6 +149,7 @@ $(COMP_UNOPKG_DESCRIPTION) :  xml/description.xml
 	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
 	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
 	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
 	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
 	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
 	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

--- a/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
+++ b/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
@@ -19,8 +19,9 @@
 #
 #**************************************************************

-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice

 EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount
 EXTENSION_VERSION=0.0.1

--- a/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml
+++ b/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml
@@ -25,6 +25,7 @@
    <platform value="#EXTENSION_PLATFORM#"/>
    <dependencies>
        <OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+        <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
    </dependencies>
    <publisher>
        <name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

--- a/odk/examples/cpp/custompanel/description.xml
+++ b/odk/examples/cpp/custompanel/description.xml
@@ -31,6 +31,7 @@
    <name>Custom Tool Panel Example</name>
  </display-name>
  <dependencies>
-    <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>
+    <OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
+    <OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
  </dependencies>
 </description>
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -29,11 +29,11 @@ OO_SDK_NAME=@OO_SDK_NAME@
 export OO_SDK_NAME

 # Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk
+# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis4.0/sdk
 OO_SDK_HOME='@OO_SDK_HOME@'

 # Office installation directory.
-# Example: OFFICE_HOME=/opt/apacheopenoffice3
+# Example: OFFICE_HOME=/opt/apacheopenoffice4
 OFFICE_HOME='@OFFICE_HOME@'
 OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'


--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -23,18 +23,18 @@ REM This script sets all enviroment variables, which
 REM are necessary for building the examples of the Office Development Kit.
 REM The Script was developed for the operating systems Windows.
 REM The SDK name
-REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
-set OO_SDK_NAME=apacheopenoffice3.0_sdk
+REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk
+set OO_SDK_NAME=apacheopenoffice4.0_sdk

 REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 4.0\sdk
 set OO_SDK_HOME=

 REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 4
 set OFFICE_HOME=

-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 4.0
 set OFFICE_BASE_HOME=

 REM URE installation directory.
@@ -73,7 +73,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
 set OO_SDK_JAVA_HOME=

 REM Special output directory
-REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
+REM Example: set OO_SDK_OUT=C:\apacheopenoffice4.0_sdk
 set OO_SDK_OUT=

 REM Automatic deployment

--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -22,7 +22,7 @@


 # used for sdk common files
-PRODUCT_RELEASE=3.5
+PRODUCT_RELEASE=4.0
 OFFICENAME=Apache OpenOffice
 SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)

--- a/offapi/com/sun/star/awt/PrinterServer.idl
+++ b/offapi/com/sun/star/awt/PrinterServer.idl
@@ -29,7 +29,7 @@ interface XPrinterServer;

 /** manages several printers on one machine.

-    @since Apache OpenOffice 3.5
+    @since Apache OpenOffice 4.0
 */
 service PrinterServer : XPrinterServer
 {

--- a/offapi/com/sun/star/ui/XStatusbarItem.idl
+++ b/offapi/com/sun/star/ui/XStatusbarItem.idl
@@ -31,7 +31,7 @@ module com {  module sun {  module star {  module ui {

    @see <type scope="com::sun::star::frame">XStatusbarController</type>

-    @since Apache OpenOffice 3.5
+    @since Apache OpenOffice 4.0
 */
 interface XStatusbarItem
 {

--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -28,8 +28,8 @@
    <identifier value="UPDATED_IDENTIFIER"/>

    <dependencies>
-        <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
-        <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+        <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+        <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
    </dependencies>

    <registration>

--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -27,8 +27,8 @@
    <identifier value="UPDATED_IDENTIFIER" />

    <dependencies>
-        <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
-        <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+        <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+        <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
    </dependencies>

    <registration>

--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -28,8 +28,8 @@
  <identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />

  <dependencies>
-    <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
-    <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+    <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+    <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
  </dependencies>

  <registration>

--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
 # *************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,19 +7,19 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 # *************************************************************
-RSCVERSION=350
-RSCREVISION=350m1(Build:9611)
-BUILD=9611
+RSCVERSION=400
+RSCREVISION=400m1(Build:9700)
+BUILD=9700
 LAST_MINOR=m1
-SOURCEVERSION=AOO350
+SOURCEVERSION=AOO400
--- a/solenv/inc/version.lst
+++ b/solenv/inc/version.lst
@@ -19,10 +19,10 @@
 #  
 #**************************************************************

-OOOBASEVERSIONMAJOR=3
-OOOBASEVERSIONMINOR=5
+OOOBASEVERSIONMAJOR=4
+OOOBASEVERSIONMINOR=0
 OOOBASEVERSIONMICRO=0

-OOOBASEVERSIONDAY=1
-OOOBASEVERSIONMONTH=4
-OOOBASEVERSIONYEAR=2012
+OOOBASEVERSIONDAY=5
+OOOBASEVERSIONMONTH=2
+OOOBASEVERSIONYEAR=2013
--- a/swext/mediawiki/src/description.xml
+++ b/swext/mediawiki/src/description.xml
@@ -31,8 +31,8 @@
        </simple-license>
    </registration>
    <dependencies>
-        <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice"/>
-        <OpenOffice.org-maximal-version value="3.9" d:name="Apache OpenOffice"/>
+        <OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
+        <OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
    </dependencies>
    <publisher>
        <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>

--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -41,7 +41,7 @@ TARGET=debian

 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"

-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.5-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i4.0-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)

 .ENDIF

@@ -56,22 +56,22 @@ ALLTAR : $(DEBFILES)

 %/DEBIAN/control : $$(@:f)
    @$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
-    ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//)) $*$/etc$/
-    /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.5//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
-        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.5//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.5//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.5//)
-    echo "Package: $(*:f:s/_/ /:1:s/3.5//)" > $@
-    cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//))/" >> $@
-    echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.5//))-$(PKGREV)" >> $@
+    ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//)) $*$/etc$/
+    /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.0//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
+        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.0//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.0//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.0//)
+    echo "Package: $(*:f:s/_/ /:1:s/4.0//)" > $@
+    cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//))/" >> $@
+    echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.0//))-$(PKGREV)" >> $@
    @du -k -s $* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@

 %/DEBIAN/postinst : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
+     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@

 %/DEBIAN/postrm : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
+     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@

 %/DEBIAN/prerm : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
+     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@

 # --- packaging ---------------------------------------------------


--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -47,10 +47,10 @@ PRODUCTLIST = apache_openoffice
 # default values to minimize maintainance effort

 # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 3.5
+PRODUCTVERSION = 4.0

 # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSIONSHORT = 3
+PRODUCTVERSIONSHORT = 4

 PKGVERSION = $(PRODUCTVERSION)
 # gnome-vfs treats everything behind the last '.' as an icon extension, 

--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -36,7 +36,7 @@ TARGET=slackware

 # --- Files --------------------------------------------------------

-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.5-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}4.0-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz

 # --- Targets -------------------------------------------------------

@@ -55,26 +55,26 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
 # FIXME: removal of *-extension.* only to create identical packages to OOF680
 %/usr/share/applications : 
    @$(MKDIRHIER) $@
-    /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.5//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.5//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
+    /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/4.0//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/4.0//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
    $(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png	
    $(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop 
    $(RM) $*$/usr$/share$/applications$/*.desktop
    $(RM) $*$/usr$/bin$/soffice

 %$/install$/doinst.sh : update-script
-    @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" > $@
-    @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" >> $@
+    @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//)) )" > $@
+    @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//)) )" >> $@
    @echo "( cd usr/bin ; rm -rf soffice )" >> $@
-    @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/program/soffice soffice )" >> $@
-    @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.5//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))-$i )") >> $@
+    @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))/program/soffice soffice )" >> $@
+    @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/4.0//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))-$i )") >> $@
    @cat $< >> $@

 %$/install$/slack-desc : slack-desc
    @$(MKDIRHIER) $(@:d)
-    @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.5//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.5//))/g" \
-        -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.5//))/g" \
-        -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//))/g" \
-        -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/g" $< > $@
+    @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/4.0//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/4.0//))/g" \
+        -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.0//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/4.0//))/g" \
+        -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.0//))/g" \
+        -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))/g" $< > $@

 # needed to satisfy the slackware package tools - they need
 # the entries like this