------------------------------------------------------------ revno: 1672 [merge] committer: Rene Engelhard <[email protected]> branch nick: experimental timestamp: Wed 2009-10-14 11:03:18 +0200 message: merge removed: openoffice.org-common.lintian-overrides openoffice.org-filter-mobiledev.lintian-overrides openoffice.org-java-common.lintian-overrides openoffice.org.lintian-overrides shell-lib.sh added: shell-lib-components.sh shell-lib-conffiles.sh shell-lib-extensions.sh modified: broffice.org.lintian-overrides broffice.org.postrm.in broffice.org.preinst.in changelog openoffice.org-base.lintian-overrides.in openoffice.org-base.preinst.in openoffice.org-common.preinst.in openoffice.org-core.postrm.in openoffice.org-dev.lintian-overrides openoffice.org-dev.preinst.in openoffice.org-emailmerge.preinst.in openoffice.org-emailmerge.prerm.in openoffice.org-evolution.preinst.in openoffice.org-evolution.prerm.in openoffice.org-filter-binfilter.preinst.in openoffice.org-filter-binfilter.prerm.in openoffice.org-filter-mobiledev.preinst.in openoffice.org-java-common.preinst.in openoffice.org-kab.preinst.in openoffice.org-kab.prerm.in openoffice.org-mysql-connector.preinst.in openoffice.org-mysql-connector.prerm.in openoffice.org-officebean.lintian-overrides openoffice.org-officebean.preinst.in openoffice.org-pdfimport.preinst.in openoffice.org-pdfimport.prerm.in openoffice.org-presentation-minimizer.postinst.in openoffice.org-presentation-minimizer.preinst.in openoffice.org-presentation-minimizer.prerm.in openoffice.org-presenter-console.preinst.in openoffice.org-presenter-console.prerm.in openoffice.org-report-builder.preinst.in openoffice.org-report-builder.prerm.in openoffice.org-sdbc-postgresql.preinst.in openoffice.org-sdbc-postgresql.prerm.in openoffice.org-wiki-publisher.postinst.in openoffice.org-wiki-publisher.preinst.in openoffice.org-wiki-publisher.prerm.in openoffice.org-writer.lintian-overrides.in openoffice.org-writer.preinst.in openoffice.org.preinst.in rules
=== modified file 'broffice.org.lintian-overrides' --- a/broffice.org.lintian-overrides 2009-10-04 00:40:54 +0000 +++ b/broffice.org.lintian-overrides 2009-10-14 07:00:58 +0000 @@ -2,6 +2,4 @@ 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 'broffice.org.postrm.in' --- a/broffice.org.postrm.in 2009-08-02 15:29:33 +0000 +++ b/broffice.org.postrm.in 2009-10-14 07:48:08 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# postrm script for broffice.org +set -e THIS_PACKAGE=broffice.org THIS_SCRIPT=postrm -set -e - #INCLUDE_SHELL_LIB# DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys /@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu /usr/share/templates/soffice.odt.desktop /usr/share/templates/soffice.ods.desktop /usr/share/templates/soffice.odp.desktop /us r/share/templates/soffice.odg.desktop" === modified file 'broffice.org.preinst.in' --- a/broffice.org.preinst.in 2009-08-02 15:29:33 +0000 +++ b/broffice.org.preinst.in 2009-10-14 07:48:08 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# preinst script for broffice.org +set -e THIS_PACKAGE=broffice.org THIS_SCRIPT=preinst -set -e - #INCLUDE_SHELL_LIB# DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/applications/openoffice....@[email protected] /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys /@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu /usr/share/templates/soffice.odt.desktop /usr/share/templates/soffice.ods.desktop /usr/share/templates/soffice.odp.desktop /us r/share/templates/soffice.odg.desktop" === modified file 'changelog' --- a/changelog 2009-10-12 02:57:10 +0000 +++ b/changelog 2009-10-14 09:03:18 +0000 @@ -15,7 +15,7 @@ - no duplicate shortcut in Insert Menu anymore (closes: #550510) * ooo-build: - - update (71f300596c850ed2e8d30b9c651a9c6f8a7aef3f) + - update (7ff794bc25495dd2503d5dcebd0ff0c22fabc57d) * debian/rules: - revert back to internal redland libs because odfmetadata2 now is in. @@ -47,21 +47,27 @@ * debian/openoffice.org-filter-binfilter.{templates,postinst.in}: - warn against those filters being obsoleted with OOo 3.4 - -- Rene Engelhard <[email protected]> Mon, 12 Oct 2009 04:52:42 +0200 + -- Rene Engelhard <[email protected]> Wed, 14 Oct 2009 11:02:48 +0200 openoffice.org (1:3.1.1-5) UNRELEASED; urgency=low * ooo-build: - - update (b9b5298e5b6e0f038786d99f12bb8190a3d607f9) - - fixes german translation (s/Verwerfen/Abbrechen) (closes: #550453) + - update (3f89d366c71b854946122cec4d2578e917e014cb) + - fixes german translation (s/Verwerfen/Abbrechen/) (closes: #550453) + - kde4_fpicker_fixes2.diff + - fixes text for checkboxes (closes: #544691) + - makes filters work (closes: #550467) * debian/control.in: - move -style-* recommends at -common to suggests (closes: #550126) - 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 + * 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... - -- Rene Engelhard <[email protected]> Wed, 07 Oct 2009 21:41:56 +0200 + -- Rene Engelhard <[email protected]> Wed, 14 Oct 2009 08:54:36 +0200 openoffice.org (1:3.1.1-4) unstable; urgency=low === modified file 'openoffice.org-base.lintian-overrides.in' --- a/openoffice.org-base.lintian-overrides.in 2009-10-04 00:40:54 +0000 +++ b/openoffice.org-base.lintian-overrides.in 2009-10-14 07:00:58 +0000 @@ -2,6 +2,4 @@ openoffice.org-base: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openoffice...@[email protected] 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....@[email protected] ooffice -openoffice.org-base: postrm-does-not-purge-debconf -openoffice.org-base: missing-debconf-dependency-for-preinst === modified file 'openoffice.org-base.preinst.in' --- a/openoffice.org-base.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-base.preinst.in 2009-10-14 07:00:58 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# preinst script for openoffice.org-base +set -e THIS_PACKAGE=openoffice.org-base THIS_SCRIPT=preinst -set -e - #INCLUDE_SHELL_LIB# case "$1" in install|upgrade) === removed file 'openoffice.org-common.lintian-overrides' --- a/openoffice.org-common.lintian-overrides 2009-10-04 00:40:54 +0000 +++ b/openoffice.org-common.lintian-overrides 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -openoffice.org-common: postrm-does-not-purge-debconf -openoffice.org-common: missing-debconf-dependency-for-preinst - === modified file 'openoffice.org-common.preinst.in' --- a/openoffice.org-common.preinst.in 2009-06-12 16:43:46 +0000 +++ b/openoffice.org-common.preinst.in 2009-10-14 07:00:58 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# preinst script for openoffice.org-common +set -e THIS_PACKAGE=openoffice.org-common THIS_SCRIPT=preinst -set -e - #INCLUDE_SHELL_LIB# case "$1" in install|upgrade) === modified file 'openoffice.org-core.postrm.in' --- a/openoffice.org-core.postrm.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-core.postrm.in 2009-10-14 07:00:58 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# postrm script for openoffice.org-core +set -e THIS_PACKAGE=openoffice.org-core THIS_SCRIPT=postrm -set -e - #INCLUDE_SHELL_LIB# if [ "$1" = "remove" ]; then === modified file 'openoffice.org-dev.lintian-overrides' --- a/openoffice.org-dev.lintian-overrides 2009-10-04 00:40:54 +0000 +++ b/openoffice.org-dev.lintian-overrides 2009-10-14 07:00:58 +0000 @@ -1,4 +1,2 @@ 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 === modified file 'openoffice.org-dev.preinst.in' --- a/openoffice.org-dev.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-dev.preinst.in 2009-10-14 07:00:58 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# preinst script for openoffice.org-dev +set -e THIS_PACKAGE=openoffice.org-dev THIS_SCRIPT=preinst -set -e - #INCLUDE_SHELL_LIB# case "$1" in install|upgrade) === modified file 'openoffice.org-emailmerge.preinst.in' --- a/openoffice.org-emailmerge.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-emailmerge.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-emailmerge - THIS_PACKAGE=openoffice.org-emailmerge THIS_SCRIPT=preinst === modified file 'openoffice.org-emailmerge.prerm.in' --- a/openoffice.org-emailmerge.prerm.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-emailmerge.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# prerm script for openoffice.org-emailmerge - THIS_PACKAGE=openoffice.org-emailmerge THIS_SCRIPT=prerm === modified file 'openoffice.org-evolution.preinst.in' --- a/openoffice.org-evolution.preinst.in 2009-05-15 20:18:09 +0000 +++ b/openoffice.org-evolution.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-evolution - THIS_PACKAGE=openoffice.org-evolution THIS_SCRIPT=preinst === modified file 'openoffice.org-evolution.prerm.in' --- a/openoffice.org-evolution.prerm.in 2009-05-15 20:18:09 +0000 +++ b/openoffice.org-evolution.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# prerm script for openoffice.org-evolution - THIS_PACKAGE=openoffice.org-evolution THIS_SCRIPT=prerm === modified file 'openoffice.org-filter-binfilter.preinst.in' --- a/openoffice.org-filter-binfilter.preinst.in 2009-08-12 20:33:48 +0000 +++ b/openoffice.org-filter-binfilter.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-filter-binfilter - THIS_PACKAGE=openoffice.org-filter-binfilter THIS_SCRIPT=preinst === modified file 'openoffice.org-filter-binfilter.prerm.in' --- a/openoffice.org-filter-binfilter.prerm.in 2009-08-12 20:33:48 +0000 +++ b/openoffice.org-filter-binfilter.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# prerm script for openoffice.org-filter-binfilter - THIS_PACKAGE=openoffice.org-filter-binfilter THIS_SCRIPT=prerm === removed file 'openoffice.org-filter-mobiledev.lintian-overrides' --- a/openoffice.org-filter-mobiledev.lintian-overrides 2009-10-04 00:40:54 +0000 +++ b/openoffice.org-filter-mobiledev.lintian-overrides 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -openoffice.org-filter-mobiledev: postrm-does-not-purge-debconf -openoffice.org-filter-mobiledev: missing-debconf-dependency-for-preinst - === modified file 'openoffice.org-filter-mobiledev.preinst.in' --- a/openoffice.org-filter-mobiledev.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-filter-mobiledev.preinst.in 2009-10-14 07:00:58 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# preinst script for openoffice.org-filter-mobiledev +set -e THIS_PACKAGE=openoffice.org-filter-mobiledev THIS_SCRIPT=preinst -set -e - #INCLUDE_SHELL_LIB# case "$1" in install|upgrade) === removed file 'openoffice.org-java-common.lintian-overrides' --- a/openoffice.org-java-common.lintian-overrides 2009-10-04 00:40:54 +0000 +++ b/openoffice.org-java-common.lintian-overrides 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -openoffice.org-java-common: postrm-does-not-purge-debconf -openoffice.org-java-common: missing-debconf-dependency-for-preinst - === modified file 'openoffice.org-java-common.preinst.in' --- a/openoffice.org-java-common.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-java-common.preinst.in 2009-10-14 07:00:58 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# preinst script for openoffice.org-java-common +set -e THIS_PACKAGE=openoffice.org-java-common THIS_SCRIPT=preinst -set -e - #INCLUDE_SHELL_LIB# case "$1" in install|upgrade) === modified file 'openoffice.org-kab.preinst.in' --- a/openoffice.org-kab.preinst.in 2009-07-13 13:31:21 +0000 +++ b/openoffice.org-kab.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-kab - THIS_PACKAGE=openoffice.org-kab THIS_SCRIPT=preinst === modified file 'openoffice.org-kab.prerm.in' --- a/openoffice.org-kab.prerm.in 2009-07-13 13:31:21 +0000 +++ b/openoffice.org-kab.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# prerm script for openoffice.org-kab - THIS_PACKAGE=openoffice.org-kab THIS_SCRIPT=prerm === modified file 'openoffice.org-mysql-connector.preinst.in' --- a/openoffice.org-mysql-connector.preinst.in 2009-08-25 09:21:28 +0000 +++ b/openoffice.org-mysql-connector.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-mysql-connector - THIS_PACKAGE=openoffice.org-mysql-connector THIS_SCRIPT=preinst === modified file 'openoffice.org-mysql-connector.prerm.in' --- a/openoffice.org-mysql-connector.prerm.in 2009-08-25 09:21:28 +0000 +++ b/openoffice.org-mysql-connector.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-mysql-connector - THIS_PACKAGE=openoffice.org-mysql-connector THIS_SCRIPT=prerm === modified file 'openoffice.org-officebean.lintian-overrides' --- a/openoffice.org-officebean.lintian-overrides 2009-10-04 00:40:54 +0000 +++ b/openoffice.org-officebean.lintian-overrides 2009-10-14 07:00:58 +0000 @@ -1,4 +1,2 @@ openoffice.org-officebean: binary-or-shlib-defines-rpath -openoffice.org-officebean: postrm-does-not-purge-debconf -openoffice.org-officebean: missing-debconf-dependency-for-preinst === modified file 'openoffice.org-officebean.preinst.in' --- a/openoffice.org-officebean.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-officebean.preinst.in 2009-10-14 07:00:58 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# preinst script for openoffice.org-officebean +set -e THIS_PACKAGE=openoffice.org-officebean THIS_SCRIPT=preinst -set -e - #INCLUDE_SHELL_LIB# case "$1" in install|upgrade) === modified file 'openoffice.org-pdfimport.preinst.in' --- a/openoffice.org-pdfimport.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-pdfimport.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-pdfimport - THIS_PACKAGE=openoffice.org-pdfimport THIS_SCRIPT=preinst === modified file 'openoffice.org-pdfimport.prerm.in' --- a/openoffice.org-pdfimport.prerm.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-pdfimport.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-pdfimport - THIS_PACKAGE=openoffice.org-pdfimport THIS_SCRIPT=prerm === modified file 'openoffice.org-presentation-minimizer.postinst.in' --- a/openoffice.org-presentation-minimizer.postinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-presentation-minimizer.postinst.in 2009-10-14 07:00:58 +0000 @@ -2,7 +2,7 @@ set -e -THIS_PACKAGE=openoffice.org-oresentation-minimizer +THIS_PACKAGE=openoffice.org-presentation-minimizer THIS_SCRIPT=postinst #INCLUDE_SHELL_LIB# === modified file 'openoffice.org-presentation-minimizer.preinst.in' --- a/openoffice.org-presentation-minimizer.preinst.in 2008-09-18 09:57:21 +0000 +++ b/openoffice.org-presentation-minimizer.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-presentation-minimizer - THIS_PACKAGE=openoffice.org-presentation-minimizer THIS_SCRIPT=preinst === modified file 'openoffice.org-presentation-minimizer.prerm.in' --- a/openoffice.org-presentation-minimizer.prerm.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-presentation-minimizer.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-sdbc-postgresql - THIS_PACKAGE=openoffice.org-sdbc-postgresql THIS_SCRIPT=prerm === modified file 'openoffice.org-presenter-console.preinst.in' --- a/openoffice.org-presenter-console.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-presenter-console.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-presenter-console - THIS_PACKAGE=openoffice.org-presenter-console THIS_SCRIPT=preinst === modified file 'openoffice.org-presenter-console.prerm.in' --- a/openoffice.org-presenter-console.prerm.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-presenter-console.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-presenter-console - THIS_PACKAGE=openoffice.org-presenter-console THIS_SCRIPT=prerm === modified file 'openoffice.org-report-builder.preinst.in' --- a/openoffice.org-report-builder.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-report-builder.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-report-builder - THIS_PACKAGE=openoffice.org-report-builder THIS_SCRIPT=preinst === modified file 'openoffice.org-report-builder.prerm.in' --- a/openoffice.org-report-builder.prerm.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-report-builder.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-report-builder - THIS_PACKAGE=openoffice.org-report-builder THIS_SCRIPT=prerm === modified file 'openoffice.org-sdbc-postgresql.preinst.in' --- a/openoffice.org-sdbc-postgresql.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-sdbc-postgresql.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-sdbc-postgresql - THIS_PACKAGE=openoffice.org-sdbc-postgresql THIS_SCRIPT=preinst === modified file 'openoffice.org-sdbc-postgresql.prerm.in' --- a/openoffice.org-sdbc-postgresql.prerm.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-sdbc-postgresql.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-sdbc-postgresql - THIS_PACKAGE=openoffice.org-sdbc-postgresql THIS_SCRIPT=prerm === modified file 'openoffice.org-wiki-publisher.postinst.in' --- a/openoffice.org-wiki-publisher.postinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-wiki-publisher.postinst.in 2009-10-14 09:02:16 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -set -e +set -e THIS_PACKAGE=openoffice.org-wiki-publisher THIS_SCRIPT=postinst === modified file 'openoffice.org-wiki-publisher.preinst.in' --- a/openoffice.org-wiki-publisher.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-wiki-publisher.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-wiki-publisher - THIS_PACKAGE=openoffice.org-wiki-publisher THIS_SCRIPT=preinst === modified file 'openoffice.org-wiki-publisher.prerm.in' --- a/openoffice.org-wiki-publisher.prerm.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-wiki-publisher.prerm.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org-wiki-publisher - THIS_PACKAGE=openoffice.org-wiki-publisher THIS_SCRIPT=prerm === modified file 'openoffice.org-writer.lintian-overrides.in' --- a/openoffice.org-writer.lintian-overrides.in 2009-10-04 00:40:54 +0000 +++ b/openoffice.org-writer.lintian-overrides.in 2009-10-14 07:00:58 +0000 @@ -2,6 +2,4 @@ openoffice.org-writer: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openoffice...@[email protected] 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....@[email protected] ooffice -openoffice.org-writer: postrm-does-not-purge-debconf -openoffice.org-writer: missing-debconf-dependency-for-preinst === modified file 'openoffice.org-writer.preinst.in' --- a/openoffice.org-writer.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org-writer.preinst.in 2009-10-14 07:00:58 +0000 @@ -1,12 +1,10 @@ #!/bin/sh -# preinst script for openoffice.org-writer +set -e THIS_PACKAGE=openoffice.org-writer THIS_SCRIPT=preinst -set -e - #INCLUDE_SHELL_LIB# case "$1" in install|upgrade) === removed file 'openoffice.org.lintian-overrides' --- a/openoffice.org.lintian-overrides 2009-10-04 00:40:54 +0000 +++ b/openoffice.org.lintian-overrides 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -openoffice.org: postinst-uses-db-input -openoffice.org: missing-debconf-dependency-for-preinst === modified file 'openoffice.org.preinst.in' --- a/openoffice.org.preinst.in 2008-07-30 01:52:28 +0000 +++ b/openoffice.org.preinst.in 2009-10-14 07:00:58 +0000 @@ -2,8 +2,6 @@ set -e -# preinst script for openoffice.org - THIS_PACKAGE=openoffice.org THIS_SCRIPT=preinst === modified file 'rules' --- a/rules 2009-10-12 02:57:10 +0000 +++ b/rules 2009-10-14 09:03:18 +0000 @@ -2005,7 +2005,7 @@ # # Generate maintainer scripts maintscripts: $(STAMP_DIR)/maintscripts -$(STAMP_DIR)/maintscripts: debian/shell-lib.sh $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(ARCH) debian/control +$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(ARCH) debian/control dh_testdir rm -f debian/*.{pre,post}{inst,rm} @@ -2019,7 +2019,17 @@ grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \ grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \ echo "" >> $$MAINTSCRIPT; \ - cat debian/shell-lib.sh >> $$MAINTSCRIPT; \ + if grep -q conffile $$MAINTSCRIPT.in; then \ + cat debian/shell-lib-conffiles.sh >> $$MAINTSCRIPT; \ + elif egrep -q "(add|remove)_extension" $$MAINTSCRIPT.in; then \ + echo ". /usr/share/debconf/confmodule" >> $$MAINTSCRIPT; \ + echo "" >> $$MAINTSCRIPT; \ + cat debian/shell-lib-extensions.sh >> $$MAINTSCRIPT; \ + elif grep -q services_rdb $$MAINTSCRIPT.in; then \ + echo ". /usr/share/debconf/confmodule" >> $$MAINTSCRIPT; \ + echo "" >> $$MAINTSCRIPT; \ + cat debian/shell-lib-components.sh >> $$MAINTSCRIPT; \ + fi; \ sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \ perl -pi -e "s/\...@langpackisos\@/$(LANGPACKISOS)/" $$MAINTSCRIPT; \ perl -pi -e "s,\...@oodir\@,$(OODIR),g" $$MAINTSCRIPT; \ === added file 'shell-lib-components.sh' --- a/shell-lib-components.sh 1970-01-01 00:00:00 +0000 +++ b/shell-lib-components.sh 2009-10-14 07:00:58 +0000 @@ -0,0 +1,30 @@ +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,'` + 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 + PID=`pgrep soffice.bin | head -n 1` + if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then + exit 1 + fi + fi + fi +} + +revoke_from_services_rdb() { + 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 +} + +register_to_services_rdb() { + 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 +} === added file 'shell-lib-conffiles.sh' --- a/shell-lib-conffiles.sh 1970-01-01 00:00:00 +0000 +++ b/shell-lib-conffiles.sh 2009-10-14 07:00:58 +0000 @@ -0,0 +1,38 @@ +# Prepare to move a conffile without triggering a dpkg question +prep_rm_conffile() { + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $2 | grep $CONFFILE | awk '{print $2}'`" + if [ "$md5sum" = "$old_md5sum" ]; then + mv "$CONFFILE" "$CONFFILE.${THIS_PACKAGE}-tmp" + fi + fi +} + +rm_conffile_commit() { + CONFFILE="$1" + + if [ -e $CONFFILE.${THIS_PACKAGE}-tmp ]; then + rm $CONFFILE.${THIS_PACKAGE}-tmp + fi +} + +# Remove a no-longer used conffile +rm_conffile() { + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $2 | grep $CONFFILE | awk '{print $2}'`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} === added file 'shell-lib-extensions.sh' --- a/shell-lib-extensions.sh 1970-01-01 00:00:00 +0000 +++ b/shell-lib-extensions.sh 2009-10-14 07:00:58 +0000 @@ -0,0 +1,46 @@ +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,'` + 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 + PID=`pgrep soffice.bin | head -n 1` + if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then + exit 1 + fi + fi + fi +} + +flush_unopkg_cache() { + /usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1 +} + +remove_extension() { + check_for_running_ooo + if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then + INSTDIR=`mktemp -d` + export PYTHONPATH="/@OOBASISDIR@/program" + basis=`readlink /usr/lib/openoffice/basis-link` + /usr/lib/openoffice/program/unopkg remove -v --shared $1 \ + "-env:UserInstallation=file://$INSTDIR" \ + "-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 + flush_unopkg_cache + fi +} + +add_extension() { + check_for_running_ooo + INSTDIR=`mktemp -d` + export PYTHONPATH="/@OOBASISDIR@/program" + basis=`readlink /usr/lib/openoffice/basis-link` + /usr/lib/openoffice/program/unopkg add -v --shared $1 \ + "-env:UserInstallation=file:///$INSTDIR" \ + "-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 +} === removed file 'shell-lib.sh' --- a/shell-lib.sh 2009-10-04 00:40:54 +0000 +++ b/shell-lib.sh 1970-01-01 00:00:00 +0000 @@ -1,122 +0,0 @@ -# vim:set ai et sts=2 sw=2 tw=0: - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the -# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while -# the script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -if [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi - -message() { - echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -} - -# Prepare to move a conffile without triggering a dpkg question -prep_rm_conffile() { - CONFFILE="$1" - - if [ -e "$CONFFILE" ]; then - md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`dpkg-query -W -f='${Conffiles}' $2 | grep $CONFFILE | awk '{print $2}'`" - if [ "$md5sum" = "$old_md5sum" ]; then - mv "$CONFFILE" "$CONFFILE.${THIS_PACKAGE}-tmp" - fi - fi -} - -rm_conffile_commit() { - CONFFILE="$1" - - if [ -e $CONFFILE.${THIS_PACKAGE}-tmp ]; then - rm $CONFFILE.${THIS_PACKAGE}-tmp - fi -} - -# Remove a no-longer used conffile -rm_conffile() { - CONFFILE="$1" - - if [ -e "$CONFFILE" ]; then - md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`dpkg-query -W -f='${Conffiles}' $2 | grep $CONFFILE | awk '{print $2}'`" - if [ "$md5sum" != "$old_md5sum" ]; then - echo "Obsolete conffile $CONFFILE has been modified by you." - echo "Saving as $CONFFILE.dpkg-bak ..." - mv -f "$CONFFILE" "$CONFFILE".bak - else - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE" - fi - fi -} - -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,'` - 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 - PID=`pgrep soffice.bin | head -n 1` - if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then - exit 1 - fi - fi - fi -} - -flush_unopkg_cache() { - /usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1 -} - -remove_extension() { - check_for_running_ooo - if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then - INSTDIR=`mktemp -d` - export PYTHONPATH="/@OOBASISDIR@/program" - basis=`readlink /usr/lib/openoffice/basis-link` - /usr/lib/openoffice/program/unopkg remove -v --shared $1 \ - "-env:UserInstallation=file://$INSTDIR" \ - "-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 - flush_unopkg_cache - fi -} - -add_extension() { - check_for_running_ooo - INSTDIR=`mktemp -d` - export PYTHONPATH="/@OOBASISDIR@/program" - basis=`readlink /usr/lib/openoffice/basis-link` - /usr/lib/openoffice/program/unopkg add -v --shared $1 \ - "-env:UserInstallation=file:///$INSTDIR" \ - "-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 -} - -revoke_from_services_rdb() { - 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 -} - -register_to_services_rdb() { - 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 -} - -VER= -
