The following commit has been merged in the master branch:
commit 102e0480e6726fa33d5a72d2280e8a62ce2ff395
Author: Rene Engelhard <[email protected]>
Date: Thu Apr 12 13:27:24 2012 +0200
more upgrade fixes (make -core P-D: on ure, run unopkg list and run preinst
of python-uno only on upgrades
diff --git a/changelog b/changelog
index 2747778..16179a7 100644
--- a/changelog
+++ b/changelog
@@ -7,7 +7,7 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
- readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if
GCC_VERSION != ""....
- actually add epoch to libqt4-dev builddeps...
- * debian/python-uno.preinst.in: only run extension stuff when upgrading
+ * debian/python{,3}-uno.preinst.in: only run extension stuff when upgrading
from version where the extension was here ...
* debian/libreoffice-script-provider-python.preinst.in: ... and copy
(old version) here
@@ -15,8 +15,11 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
- readd libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
conflicts again (lost when moved to -script-provider-python) to help
upgrades
+ - make libreoffice-core Pre-Depend on ure
+ * debian/debian/shell-lib-extensions.sh: run unopkg list before trying
+ to sync; hopefully catches cases where unopkg doesn't (yet) work
- -- Rene Engelhard <[email protected]> Thu, 12 Apr 2012 11:41:38 +0200
+ -- Rene Engelhard <[email protected]> Thu, 12 Apr 2012 13:10:19 +0200
libreoffice (1:3.5.2-3) unstable; urgency=low
diff --git a/control b/control
index ba5522e..fcd4461 100644
--- a/control
+++ b/control
@@ -89,7 +89,8 @@ Description: office productivity suite -- Indic language
packages
Package: libreoffice-core
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol |
ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15),
fontconfig, ${misc:Depends}
+Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol |
ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, fontconfig, ${misc:Depends}
+Pre-Depends: ure (>= 1.5.1+OOo3.1.1-15)
Conflicts: libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<<
${binary:Version}), libreoffice-impress (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}), libreoffice-base (<<
${binary:Version}), libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome
(<< ${binary:Version}), libreoffice-kde (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<<
${binary:Version}), libreoffice-officebean (<< ${binary:Version}),
libreoffice-dev (<< ${binary:Version}), libreoffice-style-crystal (<<
1:3.3.0-1), libreoffice-style-oxygen (<< 1:3.3.0-1), libreoffice-style-tango
(<< 1:3.3.0-1), libreoffice-style-hicontrast (<< 1:3.3.0-1),
libreoffice-style-galaxy (<< 1:3.3.0-1), libreoffice-style-andromeda (<<
1:3.3.0-1), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), 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~)
Provides: libreoffice-bundled
@@ -360,7 +361,7 @@ Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
-Conflicts: python3-uno
+Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<<
1:3.5~)
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/control.in b/control.in
index 428c37b..31cbf04 100644
--- a/control.in
+++ b/control.in
@@ -159,9 +159,9 @@ Architecture: %OOO_ARCHS%
Depends: libreofficeVER-common (>> ${base-version}),
fonts-opensymbol | ttf-opensymbol (>= 1:3.0),
${shlibs:Depends},
- ure (>= 1.5.1+OOo3.1.1-15),
fontconfig,
${misc:Depends}
+Pre-Depends: ure (>= 1.5.1+OOo3.1.1-15)
Conflicts: libreofficeVER-unbundled,
libreofficeVER-calc (<< ${binary:Version}),
libreofficeVER-writer (<< ${binary:Version}),
@@ -521,7 +521,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${python3:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: python-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<<
1:3.5~)
+Conflicts: python-uno
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/python3-uno.preinst.in b/python3-uno.preinst.in
index dd0b92a..0d8db01 100644
--- a/python3-uno.preinst.in
+++ b/python3-uno.preinst.in
@@ -5,8 +5,10 @@ set -e
#INCLUDE_SHELL_LIB#
if [ "$1" = "upgrade" ]; then
- rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
- sync_extensions
+ if dpkg --compare-versions "$2" lt "1:3.5.2-2"; then
+ rm -rf
/usr/lib/libreoffice/share/extensions/script-provider-for-python
+ sync_extensions
+ fi
fi
#DEBHELPER#
diff --git a/shell-lib-extensions.sh b/shell-lib-extensions.sh
index 074ac5c..652efd8 100644
--- a/shell-lib-extensions.sh
+++ b/shell-lib-extensions.sh
@@ -1,5 +1,7 @@
validate_extensions() {
+ if /usr/lib/libreoffice/program/unopkg list --bundled >/dev/null
2>/dev/null; then
/usr/lib/libreoffice/program/unopkg validate -v --bundled
+ fi
}
sync_extensions() {
@@ -10,12 +12,14 @@ sync_extensions() {
else
d=/usr/lib/libreoffice
fi
- if [ -e /usr/lib/libreoffice/share/prereg/bundled ] && readlink
/usr/lib/libreoffice/share/prereg/bundled 2>&1 >/dev/null; then
- /usr/lib/libreoffice/program/unopkg sync -v --bundled \
-
"-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"
\
- "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
+ if /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
+ /usr/lib/libreoffice/program/unopkg sync -v --bundled \
+
"-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"
\
+ "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
+ fi
fi
}
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
