This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch AOO50X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO50X by this push:
new 91688a930b And baseline this branch, which will serve as the basis for
AOO5.0.X with that expected version string
91688a930b is described below
commit 91688a930b1fba7aa89d2f026b3a5be01592b1f7
Author: Jim Jagielski <[email protected]>
AuthorDate: Tue Sep 1 15:16:06 2026 -0400
And baseline this branch, which will serve as the basis for AOO5.0.X with
that expected version string
---
ext_libraries/ratscan/scan/makefile.mk | 2 +-
ext_libraries/ratscan/scan/rat-scan.xml | 2 +-
main/instsetoo_native/util/openoffice.lst | 54 +++++++++++-----------
main/odk/cfgWin.js | 2 +-
main/odk/setsdkenv_unix.sh.in | 2 +-
main/odk/setsdkenv_windows.template | 4 +-
main/odk/util/makefile.pmk | 2 +-
.../source/win32/nsis/downloadtemplate.nsi | 2 +-
main/solenv/bin/modules/installer/download.pm | 2 +-
main/solenv/bin/srcrelease.xml | 2 +-
main/solenv/inc/minor.mk | 6 +--
main/solenv/inc/version.lst | 2 +-
main/sysui/desktop/debian/makefile.mk | 20 ++++----
main/sysui/desktop/productversion.mk | 2 +-
main/sysui/desktop/slackware/makefile.mk | 20 ++++----
.../testcommon/source/org/openoffice/test/Run.help | 2 +-
16 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/ext_libraries/ratscan/scan/makefile.mk
b/ext_libraries/ratscan/scan/makefile.mk
index cdf41de5de..2a986a373e 100644
--- a/ext_libraries/ratscan/scan/makefile.mk
+++ b/ext_libraries/ratscan/scan/makefile.mk
@@ -25,7 +25,7 @@ PRJ=..
.INCLUDE : settings.mk
-version=5.1.0
+version=5.0.0
.IF "$(RAT_JAR_HOME)"=="BUILD"
rat_jar_home=$(CLASSDIR)
diff --git a/ext_libraries/ratscan/scan/rat-scan.xml
b/ext_libraries/ratscan/scan/rat-scan.xml
index 9261b75fc4..7d36ee3021 100644
--- a/ext_libraries/ratscan/scan/rat-scan.xml
+++ b/ext_libraries/ratscan/scan/rat-scan.xml
@@ -25,7 +25,7 @@
<description>
Check over Apache OpenOffice source files for license headers.
</description>
- <property name="version" value="AOO 5.1.0"/>
+ <property name="version" value="AOO 5.0.0"/>
<property environment="env"/>
<property name="src-dir" location="${env.SRC_ROOT}/.."/>
diff --git a/main/instsetoo_native/util/openoffice.lst
b/main/instsetoo_native/util/openoffice.lst
index d5fa788480..e89de828d2 100644
--- a/main/instsetoo_native/util/openoffice.lst
+++ b/main/instsetoo_native/util/openoffice.lst
@@ -5,9 +5,9 @@ Globals
variables
{
APACHEPROJECTNAME Apache OpenOffice
- OOOBASEVERSION 5.1
- OOOPACKAGEVERSION 5.1.0
- UREPACKAGEVERSION 5.1.0
+ OOOBASEVERSION 5.0
+ OOOPACKAGEVERSION 5.0.0
+ UREPACKAGEVERSION 5.0.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice
UNIXBASISROOTNAME openoffice
@@ -39,9 +39,9 @@ Globals
OOOXMLFILEFORMATNAME OpenOffice.org XML
OOOXMLFILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- SERVICETAG_PRODUCTNAME Apache OpenOffice 5.1
- SERVICETAG_PRODUCTVERSION 5.1
- SERVICETAG_PARENTNAME Apache OpenOffice 5.1
+ SERVICETAG_PRODUCTNAME Apache OpenOffice 5.0
+ SERVICETAG_PRODUCTVERSION 5.0
+ SERVICETAG_PARENTNAME Apache OpenOffice 5.0
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN
urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
REGISTRATION_HOST https://registration.openoffice.org
@@ -59,7 +59,7 @@ Apache_OpenOffice
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 5.1.0
+ PRODUCTVERSION 5.0.0
PREVIOUS_VERSION 4.1.16
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -68,15 +68,15 @@ Apache_OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 5
USERDIRPRODUCTVERSION 5
- ABOUTBOXPRODUCTVERSION 5.1.0
- BASEPRODUCTVERSION 5.1
+ ABOUTBOXPRODUCTVERSION 5.0.0
+ BASEPRODUCTVERSION 5.0
PCPFILENAME openoffice.pcp
UPDATEURL
https://ooo-updates.apache.org/aoonext/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 5.1.0
+ PACKAGEVERSION 5.0.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -121,7 +121,7 @@ Apache_OpenOffice_Dev
{
FULLPRODUCTNAME Apache OpenOffice Developer Build
PRODUCTNAME OpenOffice Developer Build
- PRODUCTVERSION 5.1.0
+ PRODUCTVERSION 5.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -131,8 +131,8 @@ Apache_OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 5
USERDIRPRODUCTVERSION 5
- ABOUTBOXPRODUCTVERSION 5.1.0
- BASEPRODUCTVERSION 5.1
+ ABOUTBOXPRODUCTVERSION 5.0.0
+ BASEPRODUCTVERSION 5.0
DEVELOPMENTPRODUCT
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -142,7 +142,7 @@ Apache_OpenOffice_Dev
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 5.1.0
+ PACKAGEVERSION 5.0.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -193,19 +193,19 @@ Apache_OpenOffice_SDK
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
PRODUCTDIRNAME OpenOffice_SDK
- PRODUCTVERSION 5.1.0
+ PRODUCTVERSION 5.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 5
- PACKAGEVERSION 5.1.0
+ PACKAGEVERSION 5.0.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openoffice510sdk
+ DATABASENAME openoffice500sdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
@@ -241,18 +241,18 @@ Apache_OpenOffice_Beta_SDK
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
PRODUCTDIRNAME OpenOffice_SDK_Beta
- PRODUCTVERSION 5.1.0
+ PRODUCTVERSION 5.0.0
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 5
- PACKAGEVERSION 5.1.0
+ PACKAGEVERSION 5.0.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openoffice510betasdk
+ DATABASENAME openoffice500betasdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
@@ -288,7 +288,7 @@ Apache_OpenOffice_Dev_SDK
FULLPRODUCTNAME Apache OpenOffice Developer Build
PRODUCTNAME OpenOffice Developer Build
PRODUCTDIRNAME OpenOffice_SDK_Dev
- PRODUCTVERSION 5.1.0
+ PRODUCTVERSION 5.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -297,7 +297,7 @@ Apache_OpenOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 5
- PACKAGEVERSION 5.1.0
+ PACKAGEVERSION 5.0.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -307,7 +307,7 @@ Apache_OpenOffice_Dev_SDK
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openoffice510devsdk
+ DATABASENAME openoffice500devsdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
@@ -341,7 +341,7 @@ Apache_OpenOffice_Beta
{
FULLPRODUCTNAME Apache OpenOffice Beta
PRODUCTNAME OpenOffice Beta
- PRODUCTVERSION 5.1.0
+ PRODUCTVERSION 5.0.0
PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
BASISROOTNAME aoobeta
@@ -351,14 +351,14 @@ Apache_OpenOffice_Beta
POSTVERSIONEXTENSION
BRANDPACKAGEVERSION 5
USERDIRPRODUCTVERSION 5
- ABOUTBOXPRODUCTVERSION 5.1.0
- BASEPRODUCTVERSION 5.1
+ ABOUTBOXPRODUCTVERSION 5.0.0
+ BASEPRODUCTVERSION 5.0
UPDATEURL
https://ooo-updates.apache.org/aoonextbeta/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 5.1.0
+ PACKAGEVERSION 5.0.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
diff --git a/main/odk/cfgWin.js b/main/odk/cfgWin.js
index cff79bf5fa..7ff0aa9597 100644
--- a/main/odk/cfgWin.js
+++ b/main/odk/cfgWin.js
@@ -922,7 +922,7 @@ 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=openoffice5.1_sdk\"\n" +
+ "REM Example: @set \"OO_SDK_NAME=openoffice5.0_sdk\"\n" +
"@set \"OO_SDK_NAME=" + oo_sdk_name +
"\"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
diff --git a/main/odk/setsdkenv_unix.sh.in b/main/odk/setsdkenv_unix.sh.in
index f9ac1c3a0b..8390533d7d 100644
--- a/main/odk/setsdkenv_unix.sh.in
+++ b/main/odk/setsdkenv_unix.sh.in
@@ -29,7 +29,7 @@ OO_SDK_NAME=@OO_SDK_NAME@
export OO_SDK_NAME
# Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/openoffice/basis5.1/sdk
+# Example: OO_SDK_HOME=/opt/openoffice/basis5.0/sdk
OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
diff --git a/main/odk/setsdkenv_windows.template
b/main/odk/setsdkenv_windows.template
index de4f02828f..d1aeb23c43 100644
--- a/main/odk/setsdkenv_windows.template
+++ b/main/odk/setsdkenv_windows.template
@@ -23,7 +23,7 @@ REM This script sets all environment 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=openoffice5.1_sdk"
+REM Example: @set "OO_SDK_NAME=openoffice5.0_sdk"
@set "OO_SDK_NAME=<your_input_here>"
REM Installation directory of the Software Development Kit.
@@ -65,7 +65,7 @@ REM Example: @set "OO_SDK_JAVA_HOME=C:\Program
Files\Java\jdk1.6.0_05"
@set "OO_SDK_JAVA_HOME=<your_input_here>"
REM Special output directory
-REM Example: @set "OO_SDK_OUT=C:\openoffice5.1_sdk"
+REM Example: @set "OO_SDK_OUT=C:\openoffice5.0_sdk"
@set "OO_SDK_OUT=<your_input_here>"
REM Automatic deployment
diff --git a/main/odk/util/makefile.pmk b/main/odk/util/makefile.pmk
index a4d27c338f..b1f9ca82a8 100644
--- a/main/odk/util/makefile.pmk
+++ b/main/odk/util/makefile.pmk
@@ -22,7 +22,7 @@
# used for sdk common files
-PRODUCT_RELEASE=5.1.0
+PRODUCT_RELEASE=5.0.0
OFFICENAME=OpenOffice
.IF "$(GUI)"=="WNT"
SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
diff --git a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
index 7d17664fc8..cb302c7bf2 100644
--- a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -9,7 +9,7 @@ VIAddVersionKey CompanyName "Apache Software Foundation"
VIAddVersionKey LegalCopyright "(c) 2012-2026 The Apache Software Foundation"
VIAddVersionKey FileDescription "Apache PRODUCTNAMEPLACEHOLDER Installer"
VIAddVersionKey ProductVersion "PRODUCTVERSIONPLACEHOLDER"
-VIProductVersion "5.1.9900.500"
+VIProductVersion "5.0.9900.500"
; Enable Unicode
Unicode true
diff --git a/main/solenv/bin/modules/installer/download.pm
b/main/solenv/bin/modules/installer/download.pm
index 4c97588c87..634aafd665 100644
--- a/main/solenv/bin/modules/installer/download.pm
+++ b/main/solenv/bin/modules/installer/download.pm
@@ -606,7 +606,7 @@ sub get_download_architecture
{
# iswindowsbuild is true for BOTH Windows architectures, so
testing it
# here named every Windows download x86 -- an x64 build produced
- # Apache_OpenOffice_5.1.0_Win_x86_install_en-US.exe, a filename
+ # Apache_OpenOffice_5.0.0_Win_x86_install_en-US.exe, a filename
# identical to the x86 one and differing only in its contents.
$arch = "x64";
}
diff --git a/main/solenv/bin/srcrelease.xml b/main/solenv/bin/srcrelease.xml
index 22511c050d..226f6d33fe 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="5.1.0"/>
+ <property name="aoo.ver" value="5.0.0"/>
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn,
**/.gitignore, **/.git, **/*.log, 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, -.rej, -.orig,
build_aoo64bit_on_macos.sh" />
<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 5cc8cb3293..078fe2dd3d 100644
--- a/main/solenv/inc/minor.mk
+++ b/main/solenv/inc/minor.mk
@@ -18,8 +18,8 @@
# under the License.
#
# *************************************************************
-RSCVERSION=510
-RSCREVISION=510m1(Build:9900)
+RSCVERSION=500
+RSCREVISION=500m1(Build:9900)
BUILD=9900
LAST_MINOR=m1
-SOURCEVERSION=AOO510
+SOURCEVERSION=AOO500
diff --git a/main/solenv/inc/version.lst b/main/solenv/inc/version.lst
index f12c511ca9..74a4d68d52 100644
--- a/main/solenv/inc/version.lst
+++ b/main/solenv/inc/version.lst
@@ -20,7 +20,7 @@
#**************************************************************
OOOBASEVERSIONMAJOR=5
-OOOBASEVERSIONMINOR=1
+OOOBASEVERSIONMINOR=0
OOOBASEVERSIONMICRO=0
OOOBASEVERSIONDAY=1
diff --git a/main/sysui/desktop/debian/makefile.mk
b/main/sysui/desktop/debian/makefile.mk
index 89a8f4ca94..47614d69e4 100644
--- a/main/sysui/desktop/debian/makefile.mk
+++ b/main/sysui/desktop/debian/makefile.mk
@@ -41,7 +41,7 @@ TARGET=debian
.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i5.1-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i5.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/5.1//)) $*$/etc$/
- /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/5.1//) &&
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/5.1//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/5.1//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/5.1//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/5.1//))/' >
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/5.1//)
- echo "Package: $(*:f:s/_/ /:1:s/5.1//)" > $@
- cat $(@:f) | tr -d "\015" | sed
"s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/5.1//))/" >> $@
- echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/5.1//))-$(PKGREV)" >> $@
+ ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/5.0//)) $*$/etc$/
+ /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/5.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/5.0//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/5.0//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/5.0//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/5.0//))/' >
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/5.0//)
+ echo "Package: $(*:f:s/_/ /:1:s/5.0//)" > $@
+ cat $(@:f) | tr -d "\015" | sed
"s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/5.0//))/" >> $@
+ echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/5.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/5.1//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/5.0//))/g" > $@
%/DEBIAN/postrm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/5.1//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/5.0//))/g" > $@
%/DEBIAN/prerm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/5.1//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/5.0//))/g" > $@
# --- packaging ---------------------------------------------------
diff --git a/main/sysui/desktop/productversion.mk
b/main/sysui/desktop/productversion.mk
index 7548b3931c..20c5e1f5ac 100644
--- a/main/sysui/desktop/productversion.mk
+++ b/main/sysui/desktop/productversion.mk
@@ -48,7 +48,7 @@ PRODUCTLIST = openoffice
# default values to minimize maintenance effort
# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 5.1
+PRODUCTVERSION = 5.0
# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
PRODUCTVERSIONSHORT = 5
diff --git a/main/sysui/desktop/slackware/makefile.mk
b/main/sysui/desktop/slackware/makefile.mk
index f830bd60cf..b29f5c54fc 100644
--- a/main/sysui/desktop/slackware/makefile.mk
+++ b/main/sysui/desktop/slackware/makefile.mk
@@ -36,7 +36,7 @@ TARGET=slackware
# --- Files --------------------------------------------------------
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}5.1-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}5.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/5.1//); DESTDIR=$(shell
@cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/5.1//))
KDEMAINDIR=/opt/kde .$/create_tree.sh"
+ /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/5.0//); DESTDIR=$(shell
@cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/5.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/5.1//)) )" > $@
- @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/5.1//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//)) )" >> $@
+ @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.0//)) )" > $@
+ @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/5.0//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.0//)) )" >> $@
@echo "( cd usr/bin ; rm -rf soffice )" >> $@
- @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/5.1//))/program/soffice soffice )" >> $@
- @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/
/:1:s/5.1//)/launcherlist) "\n( cd usr/share/applications ; rm -rf
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//))-$i )\n( cd usr/share/applications ; ln
-sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//))/share/xdg/$i
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//))-$i )") >> $@
+ @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/5.0//))/program/soffice soffice )" >> $@
+ @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/
/:1:s/5.0//)/launcherlist) "\n( cd usr/share/applications ; rm -rf
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.0//))-$i )\n( cd usr/share/applications ; ln
-sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.0//))/share/xdg/$i
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.0//))-$i )") >> $@
@cat $< >> $@
%$/install$/slack-desc : slack-desc
@$(MKDIRHIER) $(@:d)
- @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/5.1//)-$(TARGET)-menus/g" -e
"s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/5.1//))/g" \
- -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/5.1//))
$(PRODUCTVERSION.$(*:b:s/-/ /:1:s/5.1//))/g" \
- -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/5.1//))/g" \
- -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.1//))/g"
$< > $@
+ @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/5.0//)-$(TARGET)-menus/g" -e
"s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/5.0//))/g" \
+ -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/5.0//))
$(PRODUCTVERSION.$(*:b:s/-/ /:1:s/5.0//))/g" \
+ -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/5.0//))/g" \
+ -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/5.0//))/g"
$< > $@
# needed to satisfy the slackware package tools - they need
# the entries like this
diff --git a/test/testcommon/source/org/openoffice/test/Run.help
b/test/testcommon/source/org/openoffice/test/Run.help
index df432bd81a..daab219e8a 100644
--- a/test/testcommon/source/org/openoffice/test/Run.help
+++ b/test/testcommon/source/org/openoffice/test/Run.help
@@ -19,4 +19,4 @@ System Property
Example
run -Dopenoffice.home=/Applications/OpenOffice.org.app/Contents -tp bvt
run -Dopenoffice.home=/Applications/OpenOffice.org.app/Contents -tc
bvt:bvt.gui.BasicFunctionTest,bvt.gui.FileTypeTest
- run
-Dopenoffice.pack=http://ci.apache.org/projects/openoffice/install/linux64/Apache_OpenOffice_5.1.0_Linux_x86-64_install-arc_en-US.tar.gz
-tp bvt
+ run
-Dopenoffice.pack=http://ci.apache.org/projects/openoffice/install/linux64/Apache_OpenOffice_5.0.0_Linux_x86-64_install-arc_en-US.tar.gz
-tp bvt
