diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2004-04-01 11:51:06 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2004-04-01 11:51:06 +0000 |
| commit | a2dcbc8cf0a473d156ca5e69a15181c657bbd474 (patch) | |
| tree | 58c52ab2002a06fb4c618f355eccd878e6d1d01a /app-office | |
| parent | New Version now based on OpenOffice.org 1.1.1 (diff) | |
| download | gentoo-2-a2dcbc8cf0a473d156ca5e69a15181c657bbd474.tar.gz gentoo-2-a2dcbc8cf0a473d156ca5e69a15181c657bbd474.tar.bz2 gentoo-2-a2dcbc8cf0a473d156ca5e69a15181c657bbd474.zip | |
Migration stuff does not work, removing
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 | 15 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild | 5 |
3 files changed, 12 insertions, 16 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index 96cb0f9fd792..cd25e1835618 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice-bin # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.39 2004/03/30 19:11:53 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.40 2004/04/01 11:51:06 suka Exp $ + + 01 Apr 2004; suka@gentoo.org openoffice-bin-1.1.1.ebuild, + files/1.1.1/ooffice-wrapper-1.3: + User settings migration does not work as there have been some changes to the + user install :-( Removing the migration stuff, you will have to redo your + settings after upgrading *openoffice-bin-1.1.1 (30 Mar 2004) diff --git a/app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 b/app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 index 3cc043f2ceed..0013d8cebe2b 100644 --- a/app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 +++ b/app-office/openoffice-bin/files/1.1.1/ooffice-wrapper-1.3 @@ -30,18 +30,9 @@ OOVERSION="OpenOffice.org ${PV}" ## [ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf -# Migration to new user install dir -if [ -d "$HOME/.openoffice/1.1.0" ] ; then - mv $HOME/.openoffice/1.1.0 $HOME/.openoffice/1.1 - sed -i -e s/'.openoffice\/1.1.0'/'.openoffice\/1.1'/g $HOME/.sversionrc - sed -i -e s/org1.1.0/org/g $HOME/.openoffice/1.1/user/basic/*.xlc - sed -i -e s/1.1.0/1.1/g $HOME/.openoffice/1.1/user/basic/*.xlc - echo "Your user install dir has been moved over to the new version" -fi - -#Make smooth up- and downgrading between minor versions possible -if [ -e "$HOME/.sversionrc" ] ; then - sed -i -e s/1.1.0/1.1.1/g $HOME/.sversionrc +if [ ! -x "$HOME/.openoffice/1.1.1" ] ; then + echo "You are starting this version of OpenOffice.org for the first time" + echo "As the user install has changed again you will have to redo your settings" fi ### diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild index 7865fe7d87a8..921548468bad 100644 --- a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild,v 1.2 2004/03/30 23:22:53 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild,v 1.3 2004/04/01 11:51:06 suka Exp $ IUSE="kde gnome" @@ -11,7 +11,6 @@ IUSE="kde gnome" LOC="/opt" INSTDIR="${LOC}/OpenOffice.org" -MY_PV="${PV/.1}" MY_P="OOo_${PV}_LinuxIntel_install" S="${WORKDIR}/${MY_P}" @@ -111,7 +110,7 @@ src_install() { # Install user autoresponse file insinto /etc/openoffice - sed -e "s|<pv>|${MY_PV}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf + sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf doins ${T}/autoresponse-${PV}.conf # Install wrapper script |