[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-3-123-gc3618b9
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 80679075bf3e2ba888bde38315f7455876fd5428
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Mar 5 08:40:44 2012 +0100
lp#916291: failing -common postinst script
lp#916291: soft fail on registering extensions
lp#916291: add a few conflicts against -common
make extensions conflicts against libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
- cherry-picked from master
Conflicts:
changelog
control.in
diff --git a/control.in b/control.in
index 18dd3a0..71176f5 100644
--- a/control.in
+++ b/control.in
@@ -212,7 +212,8 @@ Recommends: xfonts-mathml,
${textcat-data-recommends}
Conflicts: libtextcat-data (<< 2.2-8),
broffice,
- openoffice.org-common (<< 1:3.3.0~)
+ openoffice.org-common (<< 1:3.3.0~),
+ libreoffice-common (<< 1:3.5.0)
Provides: libreoffice-l10n-en-us
Breaks: libreofficeVER-style-crystal (<< 1:${oover}~),
libreofficeVER-style-oxygen (<< 1:${oover}~),
@@ -518,7 +519,7 @@ XB-Python-Version: ${python:Versions}
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreofficeVER
-Depends: libreofficeVER-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends},
${misc:Depends}
@@ -539,7 +540,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${python3:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: python-uno
+Conflicts: python-uno, libreoffice-common (<< 1:3.5.0)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --git a/libreoffice-common.postinst.in b/libreoffice-common.postinst.in
index cdd667e..e3e776d 100644
--- a/libreoffice-common.postinst.in
+++ b/libreoffice-common.postinst.in
@@ -4,17 +4,6 @@ set -e
#INCLUDE_SHELL_LIB#
-if [ "$1" = "triggered" ]; then
- for triggername in $2; do
- case "$triggername" in
- # new "bundled" extensions (since 3.3)
- "/@OODIR@/share/extensions")
- sync_extensions
- ;;
- esac
- done
-fi
-
if [ "$1" = "configure" ]; then
dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/ooffice.sh" 1:3.3.0~rc4-2 libreoffice-common -- "$@"
@@ -29,7 +18,7 @@ if [ "$1" = "configure" ]; then
rmdir /etc/openoffice 2>/dev/null || true
if dpkg --compare-versions "$2" lt "1:3.3.0-3"; then
- dpkg-trigger /@OODIR@/share/extensions
+ dpkg-trigger /@OODIR@/share/extensions || (echo "failed to trigger extension registration" && true)
fi
fi
--
LibreOffice packaging repository
Reply to: