[libreoffice] 08/19: improve Access2Base diversions
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-utopic-4.3
in repository libreoffice.
commit bd4c37333a61805a08ee583d3db3632675aa8525
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 19 19:17:08 2014 +0200
improve Access2Base diversions
Conflicts:
changelog
---
changelog | 5 +++++
libreoffice-base.postrm.in | 9 ++++++++-
libreoffice-base.preinst.in | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 72ea628..962ce7f 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,11 @@ libreoffice (1:4.3.0~rc4-0ubuntu1~utopic2) utopic; urgency=medium
* use system cdr wpd wpg wps visio mspub revenge glew glm as they are now
available
+ * cherry-pick from Debian commit d4e4101a (thanks Rene):
+ - debian/libreoffice-base.preinst.in: fix version check
+ - debian/libreoffice-base.postrm.in: add more checks for the
+ Access2Base diversions; add forgotten recommended abort-upgrade step
+ from policy manual
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 29 Jul 2014 14:30:27 +0200
diff --git a/libreoffice-base.postrm.in b/libreoffice-base.postrm.in
index 88042b2..79edfef 100644
--- a/libreoffice-base.postrm.in
+++ b/libreoffice-base.postrm.in
@@ -4,7 +4,7 @@ set -e
#INCLUDE_SHELL_LIB#
-if [ "$1" = "remove" ]; then
+if [ "$1" = remove -o "$1" = abort-install -o "$1" = disappear ]; then
dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --remove --rename \
--divert /usr/lib/libreoffice/share/basic/dialog.xlc.noaccess \
/usr/lib/libreoffice/share/basic/dialog.xlc
@@ -12,6 +12,13 @@ if [ "$1" = "remove" ]; then
--divert /usr/lib/libreoffice/share/basic/script.xlc.noaccess \
/usr/lib/libreoffice/share/basic/script.xlc
fi
+if [ "$1" = abort-upgrade ] && dpkg --compare-versions "$2" lt dpkg --compare-versions "$2" lt 1:4.3.0~beta1-1; then
+ dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --remove --rename \
+ --divert /usr/lib/libreoffice/share/basic/dialog.xlc.noaccess \
+ /usr/lib/libreoffice/share/basic/dialog.xlc
+ dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --remove --rename \
+ --divert /usr/lib/libreoffice/share/basic/script.xlc.noaccess \
+fi
#DEBHELPER#
diff --git a/libreoffice-base.preinst.in b/libreoffice-base.preinst.in
index d2e5b4c..73758be 100644
--- a/libreoffice-base.preinst.in
+++ b/libreoffice-base.preinst.in
@@ -4,7 +4,7 @@ set -e
#INCLUDE_SHELL_LIB#
-if [ upgrade != "$1" ] || dpkg --compare-versions "$2" lt 1:4.2.5~rc1-1; then
+if [ upgrade != "$1" ] || dpkg --compare-versions "$2" lt 1:4.3.0~beta1-1; then
dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --add --rename \
--divert /usr/lib/libreoffice/share/basic/dialog.xlc.noaccess \
/usr/lib/libreoffice/share/basic/dialog.xlc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: