[libreoffice] 02/04: 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.
rene pushed a commit to branch master
in repository libreoffice.
commit 2d4b019e30cc432d721f317d1263b4609eb0bcf5
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
Conflicts:
changelog
---
changelog | 4 ++--
libreoffice-base.postrm.in | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 9e899e5..fbaf139 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
libreoffice (1:4.3.0-3) unstable; urgency=medium
- * debian/libreoffice-base.postrm.in: missing \...
+ * debian/libreoffice-base.postrm.in: missing \ and broken if check...
* debian/rules:
- USE_UCPP=y (closes: #748004)
- cleanup some OpenGL-related (build-)depends/compile options:
@@ -17,7 +17,7 @@ libreoffice (1:4.3.0-3) unstable; urgency=medium
* merge from Ubuntu:
- MIR: Caladea and Carlito from Writer for metric compatibilty (LP: #1276252)
- -- Rene Engelhard <rene@debian.org> Sun, 10 Aug 2014 22:36:46 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 18 Aug 2014 16:12:28 +0200
libreoffice (1:4.3.0-2) unstable; urgency=low
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: