./packages/openofficeorg/3.1.1/unstable r1691: properly fix command-with-path-in-maintainer-script instead of overriding it
------------------------------------------------------------
revno: 1691
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sun 2009-10-04 02:40:54 +0200
message:
properly fix command-with-path-in-maintainer-script instead of overriding it
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-common.lintian-overrides
openoffice.org-dev.lintian-overrides
openoffice.org-filter-mobiledev.lintian-overrides
openoffice.org-java-common.lintian-overrides
openoffice.org-officebean.lintian-overrides
openoffice.org-pdfimport.lintian-overrides
openoffice.org-writer.lintian-overrides.in
openoffice.org.lintian-overrides
shell-lib.sh
=== modified file 'broffice.org.lintian-overrides'
--- a/broffice.org.lintian-overrides 2009-10-03 23:52:16 +0000
+++ b/broffice.org.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -2,10 +2,6 @@
broffice.org: diversion-for-unknown-file
broffice.org: orphaned-diversion
broffice.org: binary-without-manpage usr/bin/broffice
-broffice.org: command-with-path-in-maintainer-script postrm:75 /usr/bin/pgrep
-broffice.org: command-with-path-in-maintainer-script postrm:82 /usr/bin/pgrep
-broffice.org: command-with-path-in-maintainer-script preinst:75 /usr/bin/pgrep
-broffice.org: command-with-path-in-maintainer-script preinst:82 /usr/bin/pgrep
broffice.org: postrm-does-not-purge-debconf
broffice.org: missing-debconf-dependency-for-preinst
=== modified file 'changelog'
--- a/changelog 2009-10-02 14:00:56 +0000
+++ b/changelog 2009-10-04 00:40:54 +0000
@@ -38,7 +38,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 01:52:26 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
@@ -5537,7 +5537,7 @@
* debian/shlibs.woody.local:
- force removal of bogus libfreetype6 dependency on woody backport. [RE]
* debian/rules:
- - add | debconf-2.0 to the debconf depends substitution [RE]
+ - add | debconf-2.0, procps to the debconf depends substitution [RE]
- hardcode 4.2 to work around weird FTBFS (closes: #254177) [RE]
* debian/openoffice.org-java.install: add [CH, RE]
* debian/openoffice.org-java.{postrm,preinst}.in: add [CH, RE]
=== modified file 'control'
--- a/control 2009-10-03 23:52:16 +0000
+++ b/control 2009-10-04 00:40:54 +0000
@@ -376,7 +376,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})
@@ -391,7 +391,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)
@@ -435,7 +435,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), 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}
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
@@ -3300,7 +3300,7 @@
Package: openoffice.org-wiki-publisher
Section: misc
Architecture: all
-Pre-Depends: openoffice.org-java-common (>= 1:2.4.0), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.org-java-common (>= 1:2.4.0), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${mediawiki-jar-depends}, openoffice.org-core (>= 1:2.4.0-6), ${lucene-depends}, ${misc:Depends}
Enhances: openoffice.org-writer
Suggests: mediawiki
@@ -3315,7 +3315,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.1.0~), ${misc:Depends}
Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
@@ -3347,7 +3347,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
@@ -3369,7 +3369,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
@@ -3394,7 +3394,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
@@ -3490,7 +3490,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)
@@ -3504,7 +3504,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
@@ -3519,7 +3519,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.1~), ${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-03 23:52:16 +0000
+++ b/control.in 2009-10-04 00:40:54 +0000
@@ -637,7 +637,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},
@@ -656,7 +656,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)
@@ -707,7 +707,7 @@
Package: openoffice.orgVER-filter-binfilter
Section: misc
Architecture: %OOO_BINFILTER_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.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:08:34 +0000
+++ b/control.mediawiki.in 2009-10-04 00:40:54 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-wiki-publisher
Section: misc
Architecture: all
-Pre-Depends: openoffice.orgVER-java-common (>= 1:2.4.0), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0
+Pre-Depends: openoffice.orgVER-java-common (>= 1:2.4.0), ${java-runtime-depends}, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${mediawiki-jar-depends}, openoffice.orgVER-core (>= 1:2.4.0-6), ${lucene-depends},
${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-09-30 15:26:05 +0000
+++ b/control.mysql.in 2009-10-04 00:40:54 +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.1~),
${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:08:34 +0000
+++ b/control.reportdesign.in 2009-10-04 00:40:54 +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.1.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-10-03 23:52:16 +0000
+++ b/openoffice.org-base.lintian-overrides.in 2009-10-04 00:40:54 +0000
@@ -2,8 +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
-penoffice.org-base: command-with-path-in-maintainer-script preinst:75 /usr/bin/pgrep
-openoffice.org-base: command-with-path-in-maintainer-script preinst:82 /usr/bin/pgrep
openoffice.org-base: postrm-does-not-purge-debconf
openoffice.org-base: missing-debconf-dependency-for-preinst
=== modified file 'openoffice.org-common.lintian-overrides'
--- a/openoffice.org-common.lintian-overrides 2009-10-03 23:52:16 +0000
+++ b/openoffice.org-common.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,7 +1,3 @@
-openoffice.org-common: command-with-path-in-maintainer-script preinst:75 /usr
-/bin/pgrep
-openoffice.org-common: command-with-path-in-maintainer-script preinst:82 /usr
-/bin/pgrep
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 2009-10-03 23:52:16 +0000
+++ b/openoffice.org-dev.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,6 +1,4 @@
openoffice.org-dev: binary-or-shlib-defines-rpath
openoffice.org-dev: csh-considered-harmful
-openoffice.org-dev: command-with-path-in-maintainer-script preinst:75 /usr/bin/pgrep
-openoffice.org-dev: command-with-path-in-maintainer-script preinst:82 /usr/bin/pgrep
openoffice.org-dev: postrm-does-not-purge-debconf
openoffice.org-dev: missing-debconf-dependency-for-preinst
=== modified file 'openoffice.org-filter-mobiledev.lintian-overrides'
--- a/openoffice.org-filter-mobiledev.lintian-overrides 2009-10-03 23:52:16 +0000
+++ b/openoffice.org-filter-mobiledev.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,5 +1,3 @@
-openoffice.org-filter-mobiledev: command-with-path-in-maintainer-script preinst:75 /usr/bin/pgrep
-openoffice.org-filter-mobiledev: command-with-path-in-maintainer-script preinst:82 /usr/bin/pgrep
openoffice.org-filter-mobiledev: postrm-does-not-purge-debconf
openoffice.org-filter-mobiledev: missing-debconf-dependency-for-preinst
=== modified file 'openoffice.org-java-common.lintian-overrides'
--- a/openoffice.org-java-common.lintian-overrides 2009-10-03 23:52:16 +0000
+++ b/openoffice.org-java-common.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,5 +1,3 @@
-Wopenoffice.org-java-common: command-with-path-in-maintainer-script preinst:75 /usr/bin/pgrep
-openoffice.org-java-common: command-with-path-in-maintainer-script preinst:82 /usr/bin/pgrep
openoffice.org-java-common: postrm-does-not-purge-debconf
openoffice.org-java-common: missing-debconf-dependency-for-preinst
=== modified file 'openoffice.org-officebean.lintian-overrides'
--- a/openoffice.org-officebean.lintian-overrides 2009-10-03 23:52:16 +0000
+++ b/openoffice.org-officebean.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,6 +1,4 @@
openoffice.org-officebean: binary-or-shlib-defines-rpath
-openoffice.org-officebean: command-with-path-in-maintainer-script preinst:75 /usr/bin/pgrep
-openoffice.org-officebean: command-with-path-in-maintainer-script preinst:82 /usr/bin/pgrep
openoffice.org-officebean: postrm-does-not-purge-debconf
openoffice.org-officebean: missing-debconf-dependency-for-preinst
=== modified file 'openoffice.org-pdfimport.lintian-overrides'
--- a/openoffice.org-pdfimport.lintian-overrides 2009-10-03 23:52:16 +0000
+++ b/openoffice.org-pdfimport.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,3 +1,1 @@
-openoffice.org-pdfimport: command-with-path-in-maintainer-script postinst:73 /usr/bin/pgrep
-openoffice.org-pdfimport: command-with-path-in-maintainer-script postinst:80 /usr/bin/pgrep
openoffice.org-pdfimport: postinst-uses-db-input
=== modified file 'openoffice.org-writer.lintian-overrides.in'
--- a/openoffice.org-writer.lintian-overrides.in 2009-10-03 23:52:16 +0000
+++ b/openoffice.org-writer.lintian-overrides.in 2009-10-04 00:40:54 +0000
@@ -2,8 +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: command-with-path-in-maintainer-script preinst:75 /usr/bin/pgrep
-openoffice.org-writer: command-with-path-in-maintainer-script preinst:82 /usr/bin/pgrep
openoffice.org-writer: postrm-does-not-purge-debconf
openoffice.org-writer: missing-debconf-dependency-for-preinst
=== modified file 'openoffice.org.lintian-overrides'
--- a/openoffice.org.lintian-overrides 2009-10-03 23:52:16 +0000
+++ b/openoffice.org.lintian-overrides 2009-10-04 00:40:54 +0000
@@ -1,6 +1,2 @@
-openoffice.org: command-with-path-in-maintainer-script postinst:73 /usr/bin/pgrep
-openoffice.org: command-with-path-in-maintainer-script postinst:80 /usr/bin/pgrep
-openoffice.org: command-with-path-in-maintainer-script preinst:75 /usr/bin/pgrep
-openoffice.org: command-with-path-in-maintainer-script preinst:82 /usr/bin/pgrep
openoffice.org: postinst-uses-db-input
openoffice.org: missing-debconf-dependency-for-preinst
=== 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: