Author: orw
Date: Wed Jul 9 14:49:01 2014
New Revision: 1609191
URL: http://svn.apache.org/r1609191
Log:
125084: further 'version numbers' which need to be adapted to 4.1.1
Modified:
openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk
openoffice/branches/AOO410/main/sysui/desktop/productversion.mk
openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk
Modified: openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk?rev=1609191&r1=1609190&r2=1609191&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/branches/AOO410/main/sysui/desktop/debian/makefile.mk Wed Jul 9
14:49:01 2014
@@ -41,7 +41,7 @@ TARGET=debian
.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i4.0-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)}
$(PKGDIR)$/$i4.1-$(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/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)" >> $@
+ ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.1//)) $*$/etc$/
+ /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.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/4.1//))
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.1//))/' -e
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.1//))/' -e
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.1//))/' >
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.1//)
+ echo "Package: $(*:f:s/_/ /:1:s/4.1//)" > $@
+ cat $(@:f) | tr -d "\015" | sed
"s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.1//))/" >> $@
+ echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.1//))-$(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/4.0//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/4.1//))/g" > $@
%/DEBIAN/postrm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/4.0//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/4.1//))/g" > $@
%/DEBIAN/prerm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/4.0//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/
/:1:s/4.1//))/g" > $@
# --- packaging ---------------------------------------------------
Modified: openoffice/branches/AOO410/main/sysui/desktop/productversion.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sysui/desktop/productversion.mk?rev=1609191&r1=1609190&r2=1609191&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/AOO410/main/sysui/desktop/productversion.mk Wed Jul 9
14:49:01 2014
@@ -47,7 +47,7 @@ PRODUCTLIST = openoffice
# default values to minimize maintainance effort
# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 4.1
+PRODUCTVERSION = 4.1.1
# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
PRODUCTVERSIONSHORT = 4
Modified: openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk?rev=1609191&r1=1609190&r2=1609191&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk
(original)
+++ openoffice/branches/AOO410/main/sysui/desktop/slackware/makefile.mk Wed Jul
9 14:49:01 2014
@@ -36,7 +36,7 @@ TARGET=slackware
# --- Files --------------------------------------------------------
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}4.0-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}4.1-$(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/4.0//); DESTDIR=$(shell
@cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/4.0//))
KDEMAINDIR=/opt/kde .$/create_tree.sh"
+ /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/4.1//); DESTDIR=$(shell
@cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/4.1//))
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/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 etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.1//)) )" > $@
+ @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/4.1//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.1//)) )" >> $@
@echo "( cd usr/bin ; rm -rf soffice )" >> $@
- @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 )") >> $@
+ @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/
/:1:s/4.1//))/program/soffice soffice )" >> $@
+ @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/
/:1:s/4.1//)/launcherlist) "\n( cd usr/share/applications ; rm -rf
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.1//))-$i )\n( cd usr/share/applications ; ln
-sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.1//))/share/xdg/$i
$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.1//))-$i )") >> $@
@cat $< >> $@
%$/install$/slack-desc : slack-desc
@$(MKDIRHIER) $(@:d)
- @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"
$< > $@
+ @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/4.1//)-$(TARGET)-menus/g" -e
"s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/4.1//))/g" \
+ -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.1//))
$(PRODUCTVERSION.$(*:b:s/-/ /:1:s/4.1//))/g" \
+ -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.1//))/g" \
+ -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.1//))/g"
$< > $@
# needed to satisfy the slackware package tools - they need
# the entries like this
