[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 02/03: fix libreoffice-base syntax: makes no sense and seems to be a merge error



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 c2846add79b0d73a3049abb2aa3210fd40e3dd4a
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Aug 18 13:29:37 2014 +0200

    fix libreoffice-base syntax: makes no sense and seems to be a merge error
---
 changelog                  | 1 +
 libreoffice-base.postrm.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 7e704b1..40982a7 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 libreoffice (1:4.3.0-3ubuntu2) UNRELEASED; urgency=medium
 
   * MIR: Caladea and Carlito from Writer for metric compatibilty (LP: #1276252)
+  * fix libreoffice-base postrm syntax
 
  -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 15 Aug 2014 15:50:22 +0200
 
diff --git a/libreoffice-base.postrm.in b/libreoffice-base.postrm.in
index 2927e6b..2281a95 100644
--- a/libreoffice-base.postrm.in
+++ b/libreoffice-base.postrm.in
@@ -12,7 +12,7 @@ if [ "$1" = remove -o "$1" = abort-install -o "$1" = disappear ]; 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
+if [ "$1" = abort-upgrade ] && 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: