------------------------------------------------------------
revno: 1583
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2009-06-08 09:11:50 +0200
message:
try to recover from /usr/lib/openoffice/basis-link being a dir...
modified:
openoffice.org-common.preinst.in
=== modified file 'openoffice.org-common.preinst.in'
--- a/openoffice.org-common.preinst.in 2009-05-23 21:06:50 +0000
+++ b/openoffice.org-common.preinst.in 2009-06-08 07:11:50 +0000
@@ -20,6 +20,19 @@
fi
# obsolete. no conffile.
rm -f /etc/openoffice/dictionary.lst /etc/openoffice/dictionary.lst-old
+
+ # try to recover. No idea whether that completely helps but it
+ # at least gets the bogus dir away.
+ if [ -d /usr/lib/openoffice/basis-link ] && \
+ [ -e
/usr/lib/openoffice/basis-link/share/config/javasettingsunopkginstall.xml ];
then
+ rm -f
/usr/lib/openoffice/basis-link/share/config/javasettingsunopkginstall.xml
+ rmdir /usr/lib/openoffice/basis-link/share/config || true
+ rmdir /usr/lib/openoffice/basis-link/share || true
+ rmdir /usr/lib/openoffice/basis-link || true
+ fi
+
+ # move a already-filled in javasettingsunopkginstall.xml to the new
+ # location on upgrades
if [ ! -e `echo /@OOBASISDIR@ | sed -e
s/usr/var/`/share/config/javasettingsunopkginstall.xml ]; then
if [ ! -d `echo /@OOBASISDIR@ | sed -e s/usr/var/`/share/config
]; then
mkdir -p `echo /@OOBASISDIR@ | sed -e
s/usr/var/`/share/config
