The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 21bead24e429adc14ae6a69fb5109d3861356f73
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Feb 15 10:35:44 2012 +0100
lp#917153: do extension registration from -common to -core because we
actually have the binaries (unopkg.bin etc.) to do it there
add replaces/breaks for the unopkg move
diff --git a/control.in b/control.in
index e8deeac..18dd3a0 100644
--- a/control.in
+++ b/control.in
@@ -187,9 +187,9 @@ Conflicts: libreofficeVER-unbundled,
cli-uno-bridge (<< 1:3.0.0~dev300m22),
cacao-oj6-jre,
mozilla-plugin-vlc (<< 1.0)
-Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1),
myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2),
hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5),
myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<<
0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<<
20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2),
myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3),
myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt
(<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku
(<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1),
myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<<
20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2),
hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de
(<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution
(<< 1:3.4.1~), lib
reoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~),
mozilla-libreoffice (<< 1:3.5.0~beta~)
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1),
myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2),
hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5),
myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<<
0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<<
20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2),
myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3),
myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt
(<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku
(<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1),
myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<<
20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2),
hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de
(<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution
(<< 1:3.4.1~), lib
reoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~),
mozilla-libreoffice (<< 1:3.5.0~beta~), libreofficeVER-common (<<
1:3.5.0-1ubuntu1~)
Provides: libreofficeVER-bundled
-Replaces: libreofficeVER-calc (<< 1:3.3.2-5)
+Replaces: libreofficeVER-calc (<< 1:3.3.2-5), libreofficeVER-common (<<
1:3.5.0-1ubuntu1~)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/libreoffice-core.postinst.in b/libreoffice-core.postinst.in
new file mode 100644
index 0000000..99315b6
--- /dev/null
+++ b/libreoffice-core.postinst.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+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
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 37a258f..e0afc6c 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -120,7 +120,7 @@ create_package_directory
gid_Module_Optional_Extensions_PDFIMPORT pkg/libreoffic
create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN
pkg/libreoffice-presenter-console
create_package_directory gid_Module_Optional_Extensions_REPORTDESIGN
pkg/libreoffice-report-builder
create_package_directory gid_Module_Optional_PostgresqlSdbc
pkg/libreoffice-sdbc-postgresql
-move_wrappers pkg/libreoffice-common soffice unopkg
+move_wrappers pkg/libreoffice-common soffice
move_wrappers pkg/libreoffice-common libreoffice loffice lofromtemplate
move_wrappers pkg/libreoffice-base lobase
move_wrappers pkg/libreoffice-writer lowriter loweb
diff --git a/shell-lib-extensions.sh b/shell-lib-extensions.sh
index 299c6b2..46d14cf 100644
--- a/shell-lib-extensions.sh
+++ b/shell-lib-extensions.sh
@@ -14,9 +14,9 @@ sync_extensions() {
d=/usr/lib/libreoffice
fi
if HOME=$INSTDIR /usr/lib/libreoffice/program/unopkg list --bundled
>/dev/null 2>/dev/null; then
- if [ -e /usr/lib/libreoffice/share/prereg/bundled ] && readlink
/usr/lib/libreoffice/share/prereg/bundled 2>&1 >/dev/null && [ -L $d/ure-link
]; then
+ if [ -e /usr/lib/libreoffice/share/prereg/bundled ] && readlink
/usr/lib/libreoffice/share/prereg/bundled 2>&1 >/dev/null && [ -L $d/ure-link ]
&& [ -e /usr/lib/libreoffice/program/unopkg.bin ]; then
HOME=$INSTDIR \
- /usr/lib/libreoffice/program/unopkg sync -v --bundled \
+ /usr/lib/libreoffice/program/unopkg sync -v --shared \
"-env:BUNDLED_EXTENSIONS_USER=file:///usr/lib/libreoffice/share/prereg/bundled"
\
"-env:UserInstallation=file://$INSTDIR" \
"-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml"
\
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sinys-0005o2...@vasks.debian.org
