------------------------------------------------------------
revno: 2346
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Mon 2011-01-24 23:12:57 +0100
message:
  rm_conffile /etc/bash_completion.d/ooffice.sh if upgrading from older 
libreoffice-common
modified:
  changelog
  libreoffice-common.preinst.in
=== modified file 'changelog'
--- a/changelog 2011-01-24 10:18:36 +0000
+++ b/changelog 2011-01-24 22:12:57 +0000
@@ -19,6 +19,8 @@
     - some more s/OOo/LibreOffice/
     - make libreoffice-common conflict against
       openoffice.org-common (<< 1:3.3.0~)
+  * debian/libreoffice-common.preinst.in: rm_conffile
+    /etc/bash_completion.d/ooffice.sh if upgrading from older 
libreoffice-common
 
  -- Rene Engelhard <r...@debian.org>  Mon, 24 Jan 2011 01:56:24 +0100
 

=== modified file 'libreoffice-common.preinst.in'
--- a/libreoffice-common.preinst.in     2010-10-12 21:22:49 +0000
+++ b/libreoffice-common.preinst.in     2011-01-24 22:12:57 +0000
@@ -4,7 +4,7 @@
 
 #INCLUDE_SHELL_LIB#
 
-case "$1" in install)
+case "$1" in install|upgrade)
        # 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
@@ -16,6 +16,11 @@
                                 `echo /@OOBASISDIR@ | sed -e 
s/usr/var/`/share/config/javasettingsunopkginstall.xml
                fi
        fi
+
+        if dpkg --compare-versions "$2" lt "1:3.3.0~rc4-2"; then
+                rm_conffile "/etc/bash_completion.d/ooffice.sh" 
libreoffice-common
+        fi
+
        ;;
 esac
 

Reply via email to