./packages/openofficeorg/3.3.0/experimental r2069: share/extensions - not share/extension
------------------------------------------------------------
revno: 2069
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-07-20 15:24:42 +0200
message:
share/extensions - not share/extension
modified:
changelog
openoffice.org-mysql-connector.postinst.in
openoffice.org-pdfimport.postinst.in
openoffice.org-presentation-minimizer.postinst.in
openoffice.org-presenter-console.postinst.in
openoffice.org-report-builder.postinst.in
openoffice.org-sdbc-postgresql.postinst.in
openoffice.org-wiki-publisher.postinst.in
rules
=== modified file 'changelog'
--- a/changelog 2010-07-14 20:43:41 +0000
+++ b/changelog 2010-07-20 13:24:42 +0000
@@ -15,7 +15,7 @@
cleanup. remove unused THIS_SCRIPT. Use dpkgs DPKG_MAINTSCRIPT_PACKAGE
instead of THIS_SCRIPT
* debian/rules, debian/shell-lib-extensions.sh, debian/*.postinst.in:
- unpack extensions to /usr/lib/openoffice/share/extension and use
+ unpack extensions to /usr/lib/openoffice/share/extensions and use
unopkg --link
* debian/*.preinst.in: when upgrading from a m84 or newer, don't run unopkg
remove anymore
=== modified file 'openoffice.org-mysql-connector.postinst.in'
--- a/openoffice.org-mysql-connector.postinst.in 2010-06-14 17:49:21 +0000
+++ b/openoffice.org-mysql-connector.postinst.in 2010-07-20 13:24:42 +0000
@@ -5,7 +5,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extension/mysql-connector-ooo.oxt
+ add_extension_link /usr/lib/openoffice/share/extensions/mysql-connector-ooo.oxt
fi
#DEBHELPER#
=== modified file 'openoffice.org-pdfimport.postinst.in'
--- a/openoffice.org-pdfimport.postinst.in 2010-06-14 17:49:21 +0000
+++ b/openoffice.org-pdfimport.postinst.in 2010-07-20 13:24:42 +0000
@@ -5,7 +5,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extension/pdfimport.oxt
+ add_extension_link /usr/lib/openoffice/share/extensions/pdfimport.oxt
fi
#DEBHELPER#
=== modified file 'openoffice.org-presentation-minimizer.postinst.in'
--- a/openoffice.org-presentation-minimizer.postinst.in 2010-06-14 17:49:21 +0000
+++ b/openoffice.org-presentation-minimizer.postinst.in 2010-07-20 13:24:42 +0000
@@ -5,7 +5,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extension/presentation-minimizer.oxt
+ add_extension_link /usr/lib/openoffice/share/extensions/presentation-minimizer.oxt
fi
#DEBHELPER#
=== modified file 'openoffice.org-presenter-console.postinst.in'
--- a/openoffice.org-presenter-console.postinst.in 2010-06-14 17:49:21 +0000
+++ b/openoffice.org-presenter-console.postinst.in 2010-07-20 13:24:42 +0000
@@ -5,7 +5,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extension/presenter-screen.oxt
+ add_extension_link /usr/lib/openoffice/share/extensions/presenter-screen.oxt
fi
#DEBHELPER#
=== modified file 'openoffice.org-report-builder.postinst.in'
--- a/openoffice.org-report-builder.postinst.in 2010-06-14 17:49:21 +0000
+++ b/openoffice.org-report-builder.postinst.in 2010-07-20 13:24:42 +0000
@@ -5,7 +5,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extension/report-builder.oxt
+ add_extension_link /usr/lib/openoffice/share/extensions/report-builder.oxt
fi
#DEBHELPER#
=== modified file 'openoffice.org-sdbc-postgresql.postinst.in'
--- a/openoffice.org-sdbc-postgresql.postinst.in 2010-06-14 17:49:21 +0000
+++ b/openoffice.org-sdbc-postgresql.postinst.in 2010-07-20 13:24:42 +0000
@@ -5,7 +5,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extension/postgresql-sdbc*zip
+ add_extension_link /usr/lib/openoffice/share/extensions/postgresql-sdbc*zip
fi
#DEBHELPER#
=== modified file 'openoffice.org-wiki-publisher.postinst.in'
--- a/openoffice.org-wiki-publisher.postinst.in 2010-06-14 17:49:21 +0000
+++ b/openoffice.org-wiki-publisher.postinst.in 2010-07-20 13:24:42 +0000
@@ -5,7 +5,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension_link /usr/lib/openoffice/share/extension/wiki-publisher.oxt
+ add_extension_link /usr/lib/openoffice/share/extensions/wiki-publisher.oxt
fi
#DEBHELPER#
=== modified file 'rules'
--- a/rules 2010-07-14 23:17:39 +0000
+++ b/rules 2010-07-20 13:24:42 +0000
@@ -2937,48 +2937,48 @@
# in OOo and the actual report builder as an extension, without which
# the *rpt* stuff is a no-op.
rm -rf $(PKGDIR)-report-builder
- mkdir -p $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extension/report-builder.oxt
- cd $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extension/report-builder.oxt && \
+ mkdir -p $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions/report-builder.oxt
+ cd $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions/report-builder.oxt && \
unzip $(CURDIR)/$(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/report-builder.oxt
# unneeded license files
for i in THIRDPARTYREADMELICENSE.html readme_en-US.html readme_en-US.txt; do \
- rm -f $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extension/report-builder.oxt/$$i; \
+ rm -f $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions/report-builder.oxt/$$i; \
done
endif
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
rm -rf $(PKGDIR)-presentation-minimizer
- mkdir -p $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extension/presentation-minimzer.oxt
- cd $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extension/presentation-minimzer.oxt && \
+ mkdir -p $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions/presentation-minimzer.oxt
+ cd $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions/presentation-minimzer.oxt && \
unzip $(CURDIR)/$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/presentation-minimizer.oxt
endif
ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
rm -rf $(PKGDIR)-presenter-console
- mkdir -p $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extension/presenter-screen.oxt
- cd $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extension/presenter-screen.oxt && \
+ mkdir -p $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extensions/presenter-screen.oxt
+ cd $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extensions/presenter-screen.oxt && \
unzip $(CURDIR)/$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/presenter-screen.oxt
endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
rm -rf $(PKGDIR)-sdbc-postgresql
- mkdir -p $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extension/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip
- cd $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extension/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip && \
+ mkdir -p $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip
+ cd $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip && \
unzip $(CURDIR)/$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
rm -rf $(PKGDIR)-mysql-connector
- mkdir -p $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extension/mysql-connector-ooo.oxt
- cd $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extension/mysql-connector-ooo.oxt && \
+ mkdir -p $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo.oxt
+ cd $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo.oxt && \
unzip $(CURDIR)/$(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/mysql-connector-ooo.oxt
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
rm -rf $(PKGDIR)-pdfimport
- mkdir -p $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extension/pdfimport.oxt
- cd $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extension/pdfimport.oxt && \
+ mkdir -p $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions/pdfimport.oxt
+ cd $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions/pdfimport.oxt && \
unzip $(CURDIR)/$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/pdfimport.oxt
endif
@@ -3429,10 +3429,10 @@
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -rf $(PKGDIR)-wiki-publisher
- mkdir -p $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extension/wiki-publisher.oxt
- cd $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extension/wiki-publisher.oxt && \
+ mkdir -p $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions/wiki-publisher.oxt
+ cd $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions/wiki-publisher.oxt && \
unzip $(CURDIR)/$(SOURCE_TREE)/swext/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/wiki-publisher.oxt
- rm -f $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extension/wiki-publisher.oxt/license/THIRDPARTYLICENSEREADME.html
+ rm -f $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions/wiki-publisher.oxt/license/THIRDPARTYLICENSEREADME.html
endif
# add version to .lintian-overrides
Reply to: