The following commit has been merged in the master branch:
commit 5162301f6b826ac4beccb56880f4d9b999b63c31
Author: Rene Engelhard <r...@debian.org>
Date:   Fri Jul 26 00:54:41 2013 +0200

    get rid of /var/lib/libreoffice/share/config/ for good

diff --git a/changelog b/changelog
index 0188f19..2996750 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,10 @@ libreoffice (1:4.1.0-2) UNRELEASED; urgency=low
 
   * debian/rules:
     - fix uno.py, actually add starting / in LOs path 
+  * 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 <r...@debian.org>  Thu, 25 Jul 2013 18:33:02 +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

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v2ujk-0000ag...@vasks.debian.org

Reply via email to