This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-testing-4.0 in repository libreoffice.
commit 4e3ff9898801c6c15d6fb4691c3c1aa4079be675 Author: Rene Engelhard <[email protected]> Date: Fri Jul 26 00:54:41 2013 +0200 get rid of /var/lib/libreoffice/share/config/ for good Conflicts: changelog --- changelog | 4 ++++ libreoffice-common.postrm.in | 5 +++++ libreoffice-common.preinst.in | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index b849691..7ee626e 100644 --- a/changelog +++ b/changelog @@ -6,6 +6,10 @@ libreoffice (1:4.0.5~rc2-1) UNRELEASED; urgency=low - temporarily use internal orcus and mdds as the new 4.1-usable versions already are in unstable & testing - use system-clucene again now that it's in sid & testing + * debian/libreoffice-common.postrm.in: + - don't create /var/lib/libreoffice/share/config/ anymore and + remove it (and javaunopkginstall.xml if exists) on purge + (closes: #707933) -- Rene Engelhard <[email protected]> Wed, 08 Jul 2013 22:01:08 +0200 diff --git a/libreoffice-common.postrm.in b/libreoffice-common.postrm.in index b19845c..aacc57c 100644 --- a/libreoffice-common.postrm.in +++ b/libreoffice-common.postrm.in @@ -24,6 +24,11 @@ case "$1" in # and try to remove /@OOBRANDDIR@ itself rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g` || true ;; + purge) + rm /`echo @OODIR@ | sed -e s,usr/,var/,g`/share/config/javasettingsunopkginstall.xml + rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/share/config || true + rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/share + ;; esac #DEBHELPER# diff --git a/libreoffice-common.preinst.in b/libreoffice-common.preinst.in index e111eba..da39b95 100755 --- a/libreoffice-common.preinst.in +++ b/libreoffice-common.preinst.in @@ -8,9 +8,6 @@ case "$1" in install|upgrade) # move a already-filled in javasettingsunopkginstall.xml to the new # location on upgrades if [ ! -e `echo /@OODIR@ | sed -e s/usr/var/`/share/config/javasettingsunopkginstall.xml ]; then - if [ ! -d `echo /@OODIR@ | sed -e s/usr/var/`/share/config ]; then - mkdir -p `echo /@OODIR@ | sed -e s/usr/var/`/share/config - fi if [ -e `echo /@OODIR@ | sed -e s/usr/var/ | sed -e s/libre/open/`/config/javasettingsunopkginstall.xml ]; then mv `echo /@OODIR@ | sed -e s/usr/var/ | sed -e s/libre/open/`/share/config/javasettingsunopkginstall.xml \ `echo /@OODIR@ | sed -e s/usr/var/`/share/config/javasettingsunopkginstall.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
