./packages/openofficeorg/3.2/experimental r1664: merge
------------------------------------------------------------
revno: 1664 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-10-04 19:15:52 +0200
message:
merge
added:
openoffice.org-common.lintian-overrides
openoffice.org-emailmerge.lintian-overrides
openoffice.org-filter-mobiledev.lintian-overrides
openoffice.org-java-common.lintian-overrides
openoffice.org-mysql-connector.lintian-overrides
openoffice.org-pdfimport.lintian-overrides
openoffice.org-presentation-minimizer.lintian-overrides
openoffice.org-presenter-console.lintian-overrides
openoffice.org-report-builder.lintian-overrides
openoffice.org-sdbc-postgresql.lintian-overrides
openoffice.org-wiki-publisher.lintian-overrides
openoffice.org.lintian-overrides
modified:
broffice.org.lintian-overrides
changelog
control
control.in
control.kde.in
control.mediawiki.in
control.minimizer.in
control.mysql.in
control.pdfimport.in
control.postgresql.in
control.presenter.in
control.reportdesign.in
openoffice.org-base.lintian-overrides.in
openoffice.org-dev.lintian-overrides
openoffice.org-evolution.lintian-overrides
openoffice.org-filter-binfilter.lintian-overrides
openoffice.org-mysql-connector.script.bug.in
openoffice.org-officebean.lintian-overrides
openoffice.org-writer.lintian-overrides.in
rules
shell-lib.sh
=== modified file 'broffice.org.lintian-overrides'
--- a/broffice.org.lintian-overrides 2009-03-11 13:39:56 +0000
+++ b/broffice.org.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,3 +1,7 @@
broffice.org: remove-of-unknown-diversion
broffice.org: diversion-for-unknown-file
broffice.org: orphaned-diversion
+broffice.org: binary-without-manpage usr/bin/broffice
+broffice.org: postrm-does-not-purge-debconf
+broffice.org: missing-debconf-dependency-for-preinst
+
=== modified file 'changelog'
--- a/changelog 2009-10-02 17:33:40 +0000
+++ b/changelog 2009-10-04 17:15:52 +0000
@@ -48,7 +48,7 @@
-- Rene Engelhard <rene@debian.org> Fri, 02 Oct 2009 19:31:25 +0200
-openoffice.org (1:3.1.1-3) UNRELEASED; urgency=low
+openoffice.org (1:3.1.1-3) unstable; urgency=low
* The "Goodbye sparc!" release. :-(
@@ -88,7 +88,7 @@
it breaks. Removing "Adding extension XY .. done" echos
* debian/templates, debian/po: add debconf error shown when OOo is running
- -- Rene Engelhard <rene@debian.org> Fri, 02 Oct 2009 14:55:07 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 04 Oct 2009 02:42:13 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-10-02 17:33:40 +0000
+++ b/control 2009-10-04 17:15:52 +0000
@@ -102,7 +102,7 @@
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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, 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), myspell-da (<< 1.6.1
8-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)
+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
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
@@ -378,7 +378,7 @@
Package: openoffice.org-evolution
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Section: gnome
-Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${binary:Version})
@@ -393,7 +393,7 @@
Package: openoffice.org-emailmerge
Architecture: all
-Pre-Depends: ${python:Depends}, python-uno, openoffice.org-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: ${python:Depends}, python-uno, openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${misc:Depends}
Enhances: openoffice.org-writer
Replaces: python-uno (<< 1:2.4.1-5)
@@ -437,7 +437,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x
-Pre-Depends: openoffice.org-core (>= 1:3.1.0-2)
+Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<< 1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org-core (<< 1:3.1.1~rc1-2), openoffice.org2-filter-so52, openoffice.org-filter-so52
Provides: openoffice.org2-filter-so52, openoffice.org-filter-so52
@@ -712,7 +712,7 @@
Package: openoffice.org-wiki-publisher
Section: misc
Architecture: all
-Pre-Depends: openoffice.org-java-common (>= 1:3.0.0~), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-java-common (>= 1:3.0.0~), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${mediawiki-jar-depends}, openoffice.org-core (>= 1:3.0.0~), ${misc:Depends}
Enhances: openoffice.org-writer
Recommends: ${lucene-depends}
@@ -728,7 +728,7 @@
Package: openoffice.org-report-builder
Section: misc
Architecture: all
-Pre-Depends: openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>= 1:3.2.0~), ${misc:Depends}
Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
@@ -760,7 +760,7 @@
Package: openoffice.org-presentation-minimizer
Section: misc
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.3), openoffice.org-impress, ${misc:Depends}
Enhances: openoffice.org-impress
Description: OpenOffice.org extension for size-efficient presentations
@@ -782,7 +782,7 @@
Conflicts: openoffice.org-presenter-screen
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
-Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.1.0~), openoffice.org-impress (>= 1:3.1.0~), ${misc:Depends}
Enhances: openoffice.org-impress
Description: OpenOffice.org Impress extension for a separate presenter's console
@@ -807,7 +807,7 @@
Section: misc
Priority: extra
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6), ${misc:Depends}
Description: OpenOffice.org extension for importing PDF documents
OpenOffice.org is a full-featured office productivity suite that provides
@@ -903,7 +903,7 @@
Package: openoffice.org-kab
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: kaddressbook
Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
@@ -917,7 +917,7 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), ${misc:Depends}
Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212), openoffice.org-gcj (<< 2.3.0~src680m212)
Suggests: postgresql
@@ -932,7 +932,7 @@
Package: openoffice.org-mysql-connector
Section: misc
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.2~), ${misc:Depends}
Suggests: mysql-server (>= 5.1)
Homepage: http://wiki.services.openoffice.org/wiki/Database/Drivers/MySQL_Native
=== modified file 'control.in'
--- a/control.in 2009-10-02 17:33:40 +0000
+++ b/control.in 2009-10-04 17:15:52 +0000
@@ -234,7 +234,7 @@
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, 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), myspell-da (<< 1.6.1
8-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)
+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.orgVER-bundled,
openoffice.org2-core,
openoffice.org-java,
@@ -638,7 +638,7 @@
Package: openoffice.orgVER-evolution
Architecture: %OOO_ARCHS%
Section: gnome
-Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base,
${shlibs:Depends},
@@ -657,7 +657,7 @@
Package: openoffice.orgVER-emailmerge
Architecture: all
-Pre-Depends: ${python:Depends}, python-uno, openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: ${python:Depends}, python-uno, openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${misc:Depends}
Enhances: openoffice.orgVER-writer
Replaces: python-uno (<< 1:2.4.1-5)
@@ -708,7 +708,7 @@
Package: openoffice.orgVER-filter-binfilter
Section: misc
Architecture: %OOO_BINFILTER_ARCHS%
-Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2)
+Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
=== modified file 'control.kde.in'
--- a/control.kde.in 2009-10-02 12:23:41 +0000
+++ b/control.kde.in 2009-10-04 00:40:54 +0000
@@ -25,7 +25,7 @@
Package: openoffice.orgVER-kab
Architecture: %OOO_ARCHS%
-Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
=== modified file 'control.mediawiki.in'
--- a/control.mediawiki.in 2009-09-29 11:24:22 +0000
+++ b/control.mediawiki.in 2009-10-04 17:15:52 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-wiki-publisher
Section: misc
Architecture: all
-Pre-Depends: openoffice.orgVER-java-common (>= 1:3.0.0~), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-java-common (>= 1:3.0.0~), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${mediawiki-jar-depends}, openoffice.orgVER-core (>= 1:3.0.0~),
${misc:Depends}
Enhances: openoffice.orgVER-writer
=== modified file 'control.minimizer.in'
--- a/control.minimizer.in 2009-09-29 11:08:34 +0000
+++ b/control.minimizer.in 2009-10-04 00:40:54 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-presentation-minimizer
Section: misc
Architecture: %OOO_ARCHS%
-Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 2.3), openoffice.orgVER-impress,
${misc:Depends}
Enhances: openoffice.orgVER-impress
=== modified file 'control.mysql.in'
--- a/control.mysql.in 2009-10-02 00:22:29 +0000
+++ b/control.mysql.in 2009-10-04 17:15:52 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-mysql-connector
Section: misc
Architecture: %OOO_ARCHS%
-Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.2~),
${misc:Depends}
Suggests: mysql-server (>= 5.1)
=== modified file 'control.pdfimport.in'
--- a/control.pdfimport.in 2009-09-29 11:08:34 +0000
+++ b/control.pdfimport.in 2009-10-04 00:40:54 +0000
@@ -2,7 +2,7 @@
Section: misc
Priority: extra
Architecture: %OOO_ARCHS%
-Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.0.0~bea300~dev300m6),
${misc:Depends}
Description: OpenOffice.org extension for importing PDF documents
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2009-09-30 15:26:05 +0000
+++ b/control.postgresql.in 2009-10-04 00:40:54 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-sdbc-postgresql
Section: misc
Architecture: %OOO_ARCHS%
-Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212), openoffice.orgVER-gcj (<< 2.3.0~src680m212)
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2009-09-29 11:08:34 +0000
+++ b/control.presenter.in 2009-10-04 00:40:54 +0000
@@ -4,7 +4,7 @@
Conflicts: openoffice.orgVER-presenter-screen
Provides: openoffice.orgVER-presenter-screen
Replaces: openoffice.orgVER-presenter-screen
-Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.1.0~), openoffice.orgVER-impress (>= 1:3.1.0~),
${misc:Depends}
Enhances: openoffice.orgVER-impress
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2009-09-29 11:24:22 +0000
+++ b/control.reportdesign.in 2009-10-04 17:15:52 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Pre-Depends: openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin (>= 1:3.2.0~),
${misc:Depends}
Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>= ${base-version}.1)
=== modified file 'openoffice.org-base.lintian-overrides.in'
--- a/openoffice.org-base.lintian-overrides.in 2009-08-01 20:19:17 +0000
+++ b/openoffice.org-base.lintian-overrides.in 2009-10-04 00:40:54 +0000
@@ -2,3 +2,6 @@
openoffice.org-base: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-base.xpm
openoffice.org-base: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-base:4
openoffice.org-base: desktop-command-not-in-package /usr/share/applications/openoffice.org@VER@-base.desktop ooffice
+openoffice.org-base: postrm-does-not-purge-debconf
+openoffice.org-base: missing-debconf-dependency-for-preinst
+
=== added file 'openoffice.org-common.lintian-overrides'
--- a/openoffice.org-common.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-common.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -0,0 +1,3 @@
+openoffice.org-common: postrm-does-not-purge-debconf
+openoffice.org-common: missing-debconf-dependency-for-preinst
+
=== modified file 'openoffice.org-dev.lintian-overrides'
--- a/openoffice.org-dev.lintian-overrides 2008-03-13 22:11:47 +0000
+++ b/openoffice.org-dev.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,2 +1,4 @@
openoffice.org-dev: binary-or-shlib-defines-rpath
openoffice.org-dev: csh-considered-harmful
+openoffice.org-dev: postrm-does-not-purge-debconf
+openoffice.org-dev: missing-debconf-dependency-for-preinst
=== added file 'openoffice.org-emailmerge.lintian-overrides'
--- a/openoffice.org-emailmerge.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-emailmerge.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -0,0 +1,1 @@
+openoffice.org-emailmerge: postinst-uses-db-input
=== modified file 'openoffice.org-evolution.lintian-overrides'
--- a/openoffice.org-evolution.lintian-overrides 2008-03-13 22:11:47 +0000
+++ b/openoffice.org-evolution.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -1,1 +1,2 @@
openoffice.org-evolution: binary-or-shlib-defines-rpath
+openoffice.org-evolution: postinst-uses-db-input
=== modified file 'openoffice.org-filter-binfilter.lintian-overrides'
--- a/openoffice.org-filter-binfilter.lintian-overrides 2008-03-13 22:11:47 +0000
+++ b/openoffice.org-filter-binfilter.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -1,1 +1,2 @@
openoffice.org-filter-binfilter: binary-or-shlib-defines-rpath
+openoffice.org-filter-binfilter: postinst-uses-db-input
=== added file 'openoffice.org-filter-mobiledev.lintian-overrides'
--- a/openoffice.org-filter-mobiledev.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-filter-mobiledev.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -0,0 +1,3 @@
+openoffice.org-filter-mobiledev: postrm-does-not-purge-debconf
+openoffice.org-filter-mobiledev: missing-debconf-dependency-for-preinst
+
=== added file 'openoffice.org-java-common.lintian-overrides'
--- a/openoffice.org-java-common.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-java-common.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -0,0 +1,3 @@
+openoffice.org-java-common: postrm-does-not-purge-debconf
+openoffice.org-java-common: missing-debconf-dependency-for-preinst
+
=== added file 'openoffice.org-mysql-connector.lintian-overrides'
--- a/openoffice.org-mysql-connector.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-mysql-connector.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -0,0 +1,1 @@
+openoffice.org-mysql-connector: postinst-uses-db-input
=== modified file 'openoffice.org-mysql-connector.script.bug.in'
--- a/openoffice.org-mysql-connector.script.bug.in 2009-09-29 06:42:02 +0000
+++ b/openoffice.org-mysql-connector.script.bug.in 2009-10-03 23:52:16 +0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/ure/bin/regview /var/lib/openoffice/basis3.1/program/services.rdb | grep evo > &3
+/usr/lib/openoffice/program/unopkg list --shared com.sun.star.mysql-connector-ooo-$PLATFORMID >&3
=== modified file 'openoffice.org-officebean.lintian-overrides'
--- a/openoffice.org-officebean.lintian-overrides 2008-03-13 22:11:47 +0000
+++ b/openoffice.org-officebean.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,1 +1,4 @@
openoffice.org-officebean: binary-or-shlib-defines-rpath
+openoffice.org-officebean: postrm-does-not-purge-debconf
+openoffice.org-officebean: missing-debconf-dependency-for-preinst
+
=== added file 'openoffice.org-pdfimport.lintian-overrides'
--- a/openoffice.org-pdfimport.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-pdfimport.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -0,0 +1,1 @@
+openoffice.org-pdfimport: postinst-uses-db-input
=== added file 'openoffice.org-presentation-minimizer.lintian-overrides'
--- a/openoffice.org-presentation-minimizer.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-presentation-minimizer.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -0,0 +1,1 @@
+openoffice.org-presentation-minimizer: postinst-uses-db-input
=== added file 'openoffice.org-presenter-console.lintian-overrides'
--- a/openoffice.org-presenter-console.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-presenter-console.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -0,0 +1,1 @@
+openoffice.org-presenter-console: postinst-uses-db-input
=== added file 'openoffice.org-report-builder.lintian-overrides'
--- a/openoffice.org-report-builder.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-report-builder.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -0,0 +1,1 @@
+openoffice.org-report-builder: postinst-uses-db-input
=== added file 'openoffice.org-sdbc-postgresql.lintian-overrides'
--- a/openoffice.org-sdbc-postgresql.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-sdbc-postgresql.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -0,0 +1,1 @@
+openoffice.org-sdbc-postgresql: postinst-uses-db-input
=== added file 'openoffice.org-wiki-publisher.lintian-overrides'
--- a/openoffice.org-wiki-publisher.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-wiki-publisher.lintian-overrides 2009-10-03 23:52:16 +0000
@@ -0,0 +1,1 @@
+openoffice.org-wiki-publisher: postinst-uses-db-input
=== modified file 'openoffice.org-writer.lintian-overrides.in'
--- a/openoffice.org-writer.lintian-overrides.in 2009-08-01 20:19:17 +0000
+++ b/openoffice.org-writer.lintian-overrides.in 2009-10-04 00:40:54 +0000
@@ -2,3 +2,6 @@
openoffice.org-writer: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-writer.xpm
openoffice.org-writer: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-writer:5
openoffice.org-writer: desktop-command-not-in-package /usr/share/applications/openoffice.org@VER@-writer.desktop ooffice
+openoffice.org-writer: postrm-does-not-purge-debconf
+openoffice.org-writer: missing-debconf-dependency-for-preinst
+
=== added file 'openoffice.org.lintian-overrides'
--- a/openoffice.org.lintian-overrides 1970-01-01 00:00:00 +0000
+++ b/openoffice.org.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -0,0 +1,2 @@
+openoffice.org: postinst-uses-db-input
+openoffice.org: missing-debconf-dependency-for-preinst
=== modified file 'rules'
--- a/rules 2009-10-02 17:33:40 +0000
+++ b/rules 2009-10-04 17:15:52 +0000
@@ -3144,7 +3144,7 @@
ooo-build/NEWS
dh_installdocs -plibmythes-dev debian/copyright
for p in pdfimport presenter-console mysql-connector filter-binfilter \
- evolution kab sdbc-postgresql; do \
+ evolution kab sdbc-postgresql presentation-minimizer; do \
cat debian/templates > debian/openoffice.org-$$p.templates; \
if [ -e debian/debian/openoffice.org-$$p.templates.in ]; then \
cat debian/debian/openoffice.org-$$p.templates.in \
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2009-09-29 12:56:48 +0000
+++ b/shell-lib.sh 2009-10-04 00:40:54 +0000
@@ -59,16 +59,12 @@
check_for_running_ooo() {
if [ -e /usr/lib/openoffice/program/bootstraprc ]; then
LOCKFILE=`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`
- if [ -x /usr/bin/pgrep ]; then
- PID=`/usr/bin/pgrep soffice.bin | head -n 1`
- fi
+ PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
db_input high openoffice.org/running
db_go
# try again in case OOo got closed before hitting OK
- if [ -x /usr/bin/pgrep ]; then
- PID=`/usr/bin/pgrep soffice.bin | head -n 1`
- fi
+ PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
exit 1
fi
Reply to: