Author: orw
Date: Fri Dec 21 11:40:04 2012
New Revision: 1424877
URL: http://svn.apache.org/viewvc?rev=1424877&view=rev
Log:
#119977# - complete the update to version number 3.5
Modified:
openoffice/trunk/main/instsetoo_native/util/openoffice.lst
openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README
openoffice/trunk/main/sysui/desktop/debian/makefile.mk
openoffice/trunk/main/sysui/desktop/slackware/makefile.mk
Modified: openoffice/trunk/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst?rev=1424877&r1=1424876&r2=1424877&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst Fri Dec 21
11:40:04 2012
@@ -21,7 +21,7 @@ Globals
UREPACKAGEPREFIX openoffice.org
SOLSUREPACKAGEPREFIX openofficeorg
USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
+ LIBRARYVERSION 9.5.0
POOLPRODUCT 1
REGISTRATION_HOST https://registration.openoffice.org
REGISTRATIONURL
http://survey.services.openoffice.org/user/index.php
@@ -54,7 +54,7 @@ OpenOffice
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -88,7 +88,7 @@ OpenOffice
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
+ LIBRARYVERSION 9.5.0
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
@@ -118,7 +118,7 @@ OpenOffice_wJRE
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -152,7 +152,7 @@ OpenOffice_wJRE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
+ LIBRARYVERSION 9.5.0
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
DOWNLOADBANNER ooobanner.bmp
@@ -182,7 +182,7 @@ OpenOffice_Dev
variables
{
PRODUCTNAME OOo-dev
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -222,7 +222,7 @@ OpenOffice_Dev
CHANGETARGETDIR 1
USE_FILEVERSION 1
JAVAPRODUCT 0
- LIBRARYVERSION 9.4.0
+ LIBRARYVERSION 9.5.0
PATCHCODEFILE ooodev_patchcodes.txt
CODEFILENAME codes_ooodev.txt
DOWNLOADBANNER ooobanner.bmp
@@ -255,7 +255,7 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.5.0
PACKAGEVERSION 3.5
PACKAGEREVISION 1
PRODUCTEXTENSION
@@ -296,7 +296,7 @@ OpenOffice_SDK
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -342,7 +342,7 @@ OpenOffice_Dev_SDK
variables
{
PRODUCTNAME OOo-dev
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
Modified: openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README?rev=1424877&r1=1424876&r2=1424877&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README (original)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README Fri Dec
21 11:40:04 2012
@@ -23,6 +23,29 @@ Some documentation for the variables spe
VARIABLE NAME USAGE
-------------------------------------------------------------------------------
+PRODUCTVERSION Beside other stuff it is used together with
+ the "buildid" (main/solenv/inc/minor.mk) to
+ create the ProductVersion property for
+ Microsoft Windows - "major.minor.build".
+ Note: major = [0..255], minor = [0..255],
+ build = [0..65535]
+ It is expected that PRODUCTVERSION follows
+ one of the following patterns:
+ (1) single decimal - e.g. "3"
+ (2) dec. dot dec. - e.g. "3.4"
+ (3) dec. dot dec. dot dec. - e.g. "3.4.1"
+ The first decimal is put into "major".
+ The second decimal is concatenated with the
third
+ and is put into "minor".
+ E.g. "3.4.1" becomes "3.41.[buildid]"
+ The ProductVersion property is used during
+ the Windows installation to check, if a
+ newer or older version is already installed.
+
+LIBRARYVERSION Together with "buildid" and "vendornumber"
+ it becomes the version of the installation
+ files
+
BASISPACKAGEPREFIX name prefix for the installation packages
for Linux/Solaris platforms
UREPACKAGEPREFIX name prefix for the URE installation packages
Modified: openoffice/trunk/main/sysui/desktop/debian/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/makefile.mk?rev=1424877&r1=1424876&r2=1424877&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/debian/makefile.mk Fri Dec 21 11:40:04
2012
@@ -41,7 +41,7 @@ TARGET=debian
.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i3.4-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i3.5-$(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.4//)) $*$/etc$/
- /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.4//) &&
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.4//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.4//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.4//))/' >
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.4//)
- echo "Package: $(*:f:s/_/ /:1:s/3.4//)" > $@
- cat $(@:f) | tr -d "\015" | sed
"s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//))/" >> $@
- echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.4//))-$(PKGREV)" >> $@
+ 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)" >> $@
@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.4//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.5//))/g" > $@
%/DEBIAN/postrm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.4//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.5//))/g" > $@
%/DEBIAN/prerm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.4//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/3.5//))/g" > $@
# --- packaging ---------------------------------------------------
Modified: openoffice/trunk/main/sysui/desktop/slackware/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/slackware/makefile.mk?rev=1424877&r1=1424876&r2=1424877&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/slackware/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/slackware/makefile.mk Fri Dec 21
11:40:04 2012
@@ -36,7 +36,7 @@ TARGET=slackware
# --- Files --------------------------------------------------------
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.4-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.5-$(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.4//); DESTDIR=$(shell
@cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.4//))
KDEMAINDIR=/opt/kde .$/create_tree.sh"
+ /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"
$(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.4//)) )" > $@
- @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/3.4//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//)) )" >> $@
+ @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 usr/bin ; rm -rf soffice )" >> $@
- @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/3.4//))/program/soffice soffice )" >> $@
- @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/
/:1:s/3.4//)/launcherlist) "\n( cd usr/share/applications ; rm -rf
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))-$i )\n( cd usr/share/applications ; ln
-sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/share/xdg/$i
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))-$i )") >> $@
+ @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 )") >> $@
@cat $< >> $@
%$/install$/slack-desc : slack-desc
@$(MKDIRHIER) $(@:d)
- @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.4//)-$(TARGET)-menus/g" -e
"s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.4//))/g" \
- -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.4//))
$(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.4//))/g" \
- -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.4//))/g" \
- -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/g"
$< > $@
+ @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"
$< > $@
# needed to satisfy the slackware package tools - they need
# the entries like this
