./packages/openofficeorg/3.2/experimental r1674: merge
------------------------------------------------------------
revno: 1674 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2009-10-16 23:40:56 +0200
message:
merge
modified:
changelog
control
control.in
openoffice.org-core.postrm.in
rules
shell-lib-components.sh
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2009-10-16 21:38:10 +0000
+++ b/changelog 2009-10-16 21:40:56 +0000
@@ -52,7 +52,7 @@
openoffice.org (1:3.1.1-5) UNRELEASED; urgency=low
* ooo-build:
- - update (3f89d366c71b854946122cec4d2578e917e014cb)
+ - update (01bbcda85cb32be9eb5334430fb208ec5ca60041)
- fixes german translation (s/Verwerfen/Abbrechen/) (closes: #550453)
- kde4_fpicker_fixes2.diff
- fixes text for checkboxes (closes: #544691)
@@ -63,11 +63,17 @@
- build-depend on po-debconf
- build-depend on binutils (>= 2.20) and g{cc,++}-4.4 (>= 4.4.1-6) for
armel, see http://gcc.gnu.org/PR40521
+ - make -core provide openoffice.org-headless
* debian/shell-lib.sh, debian/shell-lib*.sh, debian/*.lintian-overrides*,
debian/rules: only add the functions needed to the respective maintainer
scripts to prevent some bad side-effects, thanks Steve Langasek...
+ * debian/shell-lib-{components,extensions}.sh: check for known OOo-using
+ services (docvert-openoffice.org) and stop/start them
+ * debian/rules:
+ - install extension shell lib for use by extensions not from here
+ - enable el help (thanks Fotis Tsamis for telling it is enough translated)
- -- Rene Engelhard <rene@debian.org> Wed, 14 Oct 2009 08:54:36 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 16 Oct 2009 21:29:41 +0200
openoffice.org (1:3.1.1-4) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-10-11 22:09:23 +0000
+++ b/control 2009-10-16 21:40:56 +0000
@@ -103,7 +103,7 @@
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-core (<< ${binary:Version}), openoffice.org-calc (<< ${binary:Version}), openoffice.org-writer (<< ${binary:Version}), openoffice.org-i
mpress (<< ${binary:Version}), openoffice.org-draw (<< ${binary:Version}), openoffice.org-base (<< ${binary:Version}), openoffice.org-gtk (<< ${binary:Version}), openoffice.org-gnome (<< ${binary:Version}), openoffice.org-kde (<< ${binary:Version}), openoffice.org-evolution (<< ${binary:Version}), openoffice.org-filter-so52 (<< ${binary:Version}), openoffice.org-officebean (<< ${binary:Version}), openoffice.org-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), 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), openoffice.org-hyphenation-hr (<< 20060617-2), openoffice.org-hyphenation-pl (<< 1:3
.0a-3), openoffice.org-hyphenation-sh (<< 1:3.1.0-3), openoffice.org-hyphenation-sr (<< 1:3.1.0-3), openoffice.org-hyphenation-de (<< 1:3.1.0-3), openoffice.org-hyphenation-hu (<< 1:3.1.0-3), openoffice.org-hyphenation-it (<< 1:3.1.0-3), openoffice.org-hyphenation-sl (<< 1:3.1.0-3), openoffice.org-hyphenation-af (<< 1:3.1.0-3), openoffice.org-hyphenation-zu (<< 1:3.1.0-3), openoffice.org-hyphenation-fr (<< 1:3.1.0-3), openoffice.org-thesaurus-it (<< 2.0.7.gh.deb1-1.1), openoffice.org-thesaurus-en-au (<< 2.1-5), openoffice.org-thesaurus-pl (<< 1.5-3), openoffice.org-thesaurus-en-us (<< 1:3.1.0-3), openoffice.org-thesaurus-cs (<< 1:3.1.0-3), openoffice.org-thesaurus-sk (<< 1:3.1.0-3), openoffice.org-thesaurus-ru (<< 1:3.1.0-3), openoffice.org-thesaurus-ne (<< 1:3.1.0-3), openoffice.org-thesaurus-hu (<< 1:3.1.0-3), openoffice.org-thesaurus-fr (<< 1:3.1.0-3)
-Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell
+Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-headless
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<< 2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<< 1:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2), openoffice.org-headless (<< 1:3.0.0~dev300m26), openoffice.org-filter-binfilter (<< 1:3.1.0-5)
Description: full-featured office productivity suite -- arch-dependent files
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.in'
--- a/control.in 2009-10-11 22:09:23 +0000
+++ b/control.in 2009-10-16 21:40:56 +0000
@@ -240,7 +240,8 @@
openoffice.org2-core,
openoffice.org-java,
openoffice.org2-hunspell,
- openoffice.org-hunspell
+ openoffice.org-hunspell,
+ openoffice.org-headless
Replaces: openoffice.org-bin,
openoffice.org (<< 1.9),
openoffice.org-gtk (<< 2.0.3+2.0.4m179),
=== modified file 'openoffice.org-core.postrm.in'
--- a/openoffice.org-core.postrm.in 2009-10-14 07:00:58 +0000
+++ b/openoffice.org-core.postrm.in 2009-10-14 13:30:01 +0000
@@ -8,7 +8,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "remove" ]; then
- rm -rf /var/spool/openoffice$VER
+ rm -rf /var/spool/openoffice@VER@
fi
#DEBHELPER#
=== modified file 'rules'
--- a/rules 2009-10-16 21:38:10 +0000
+++ b/rules 2009-10-16 21:40:56 +0000
@@ -634,8 +634,8 @@
pa-IN pl pt pt-BR ro ru rw sk sl sr ss st sv \
ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu
#HELPISOS:=$(shell ooo-build/bin//openoffice-xlate-lang -i all')
- HELPISOS:=en-US ca cs da de dz en-GB es et eu fi fr gl hi-IN hu it ja \
- km ko nl pl pt pt-BR ru sl sv zh-CN zh-TW
+ HELPISOS:=en-US ca cs da de dz el en-GB es et eu fi fr gl hi-IN hu it \
+ ja km ko nl pl pt pt-BR ru sl sv zh-CN zh-TW
#LANGPACKISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
LANGPACKISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
@@ -3142,6 +3142,10 @@
# fix permission
chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
+ # install extension shell lib for use by extensions not from here
+ install -D -m755 debian/shell-lib-extensions.sh \
+ $(PKGDIR)-common/usr/share/$(OODIRNAME)/shell-lib-extensions.sh
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2009-10-14 07:00:58 +0000
+++ b/shell-lib-components.sh 2009-10-16 12:33:56 +0000
@@ -14,17 +14,34 @@
fi
}
+handle_soffice_listeners() {
+ services="docvert-converter"
+ for s in $services; do
+ if [ -x /etc/init.d/$s ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d $s $1
+ else
+ /etc/init.d/$s $1
+ fi
+ fi
+ done
+}
+
revoke_from_services_rdb() {
+ handle_soffice_listeners stop
check_for_running_ooo
rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
lib="`basename $1`"
if [ -e "$rdb" ] && /usr/lib/ure/bin/regview $rdb | grep -q $lib; then
/usr/lib/ure/bin/regcomp -revoke -r $rdb -br $rdb -c file://$1
fi
+ handle_soffice_listeners start
}
register_to_services_rdb() {
+ handle_soffice_listeners stop
check_for_running_ooo
rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
/usr/lib/ure/bin/regcomp -register -r $rdb -br $rdb -c file://$1
+ handle_soffice_listeners start
}
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2009-10-14 07:00:58 +0000
+++ b/shell-lib-extensions.sh 2009-10-16 12:33:56 +0000
@@ -14,11 +14,25 @@
fi
}
+handle_soffice_listeners() {
+ services="docvert-converter"
+ for s in $services; do
+ if [ -x /etc/init.d/$s ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d $s $1
+ else
+ /etc/init.d/$s $1
+ fi
+ fi
+ done
+}
+
flush_unopkg_cache() {
/usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1
}
remove_extension() {
+ handle_soffice_listeners stop
check_for_running_ooo
if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then
INSTDIR=`mktemp -d`
@@ -31,9 +45,11 @@
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
flush_unopkg_cache
fi
+ handle_soffice_listeners start
}
add_extension() {
+ handle_soffice_listeners stop
check_for_running_ooo
INSTDIR=`mktemp -d`
export PYTHONPATH="/@OOBASISDIR@/program"
@@ -43,4 +59,5 @@
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml" \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
+ handle_soffice_listeners start
}
Reply to: