------------------------------------------------------------
revno: 2127
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Mon 2010-10-04 19:54:30 +0200
message:
move to /usr/lib/libreoffice; change version so that we can still use
basis-version for dependencies
renamed:
openoffice.org-common.triggers => openoffice.org-common.triggers.in
modified:
changelog
openoffice.org-base.preinst.in
openoffice.org-common.postinst.in
openoffice.org-common.preinst.in
openoffice.org-core.bug-script.in
openoffice.org-dev.preinst.in
openoffice.org-filter-mobiledev.preinst.in
openoffice.org-java-common.preinst.in
openoffice.org-mysql-connector.bug-script.in
openoffice.org-mysql-connector.preinst.in
openoffice.org-officebean.preinst.in
openoffice.org-pdfimport.bug-script.in
openoffice.org-pdfimport.preinst.in
openoffice.org-presentation-minimizer.bug-script.in
openoffice.org-presentation-minimizer.preinst.in
openoffice.org-presenter-console.bug-script.in
openoffice.org-presenter-console.preinst.in
openoffice.org-report-builder.bug-script.in
openoffice.org-report-builder.preinst.in
openoffice.org-sdbc-postgresql.bug-script.in
openoffice.org-sdbc-postgresql.preinst.in
openoffice.org-wiki-publisher.bug-script.in
openoffice.org-wiki-publisher.preinst.in
openoffice.org-writer.preinst.in
rules
shell-lib-extensions.sh
openoffice.org-common.triggers.in
=== modified file 'changelog'
--- a/changelog 2010-10-04 15:44:42 +0000
+++ b/changelog 2010-10-04 17:54:30 +0000
@@ -1,12 +1,13 @@
-libreoffice (1:3.2.99.2~20100930-1) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~3.2.99.2~20100930-1) UNRELEASED; urgency=low
* welcome, LibreOffice
includes with OpenOffice.org 3.3.0 release branch milestone 7, so:
- fixes hebrew text in sheet tabs when using system fonts
(closes: #433231)
- * switch to new LibreOffice build infrastructure, update Homepage:. LO uses
own
- splash, so this indirectly closes: #529709
+ * switch to new LibreOffice build infrastructure (more or less ooo-build,
+ though), update Homepage:.
+ LO uses own splash, so this indirectly closes: #529709
* debian/rules:
- add and rework target(s) for new external sources handling upstream
=== modified file 'openoffice.org-base.preinst.in'
--- a/openoffice.org-base.preinst.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-base.preinst.in 2010-10-04 17:54:30 +0000
@@ -5,9 +5,9 @@
#INCLUDE_SHELL_LIB#
case "$1" in install|upgrade)
- if [ -L /usr/lib/openoffice/program/classes ]; then
- rm /usr/lib/openoffice/program/classes
- mkdir /usr/lib/openoffice/program/classes
+ if [ -L /usr/lib/libreoffice/program/classes ]; then
+ rm /usr/lib/libreoffice/program/classes
+ mkdir /usr/lib/libreoffice/program/classes
fi
;;
esac
=== modified file 'openoffice.org-common.postinst.in'
--- a/openoffice.org-common.postinst.in 2010-09-20 22:46:57 +0000
+++ b/openoffice.org-common.postinst.in 2010-10-04 17:54:30 +0000
@@ -8,7 +8,7 @@
for triggername in $2; do
case "$triggername" in
# new "bundled" extensions (since 3.3)
- "/usr/lib/openoffice/share/extensions")
+ "/usr/lib/libreoffice/share/extensions")
sync_extensions
;;
esac
=== modified file 'openoffice.org-common.preinst.in'
--- a/openoffice.org-common.preinst.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-common.preinst.in 2010-10-04 17:54:30 +0000
@@ -18,13 +18,13 @@
# try to recover. No idea whether that completely helps but it
# at least gets the bogus dir away.
- if [ -e /usr/lib/openoffice/basis-link -a \
- ! -L /usr/lib/openoffice/basis-link ] && \
- [ -e
/usr/lib/openoffice/basis-link/share/config/javasettingsunopkginstall.xml ];
then
- rm -f
/usr/lib/openoffice/basis-link/share/config/javasettingsunopkginstall.xml
- rmdir --ignore-fail-on-non-empty
/usr/lib/openoffice/basis-link/share/config
- rmdir --ignore-fail-on-non-empty
/usr/lib/openoffice/basis-link/share
- rmdir --ignore-fail-on-non-empty /usr/lib/openoffice/basis-link
+ if [ -e /usr/lib/libreoffice/basis-link -a \
+ ! -L /usr/lib/libreoffice/basis-link ] && \
+ [ -e
/usr/lib/libreoffice/basis-link/share/config/javasettingsunopkginstall.xml ];
then
+ rm -f
/usr/lib/libreoffice/basis-link/share/config/javasettingsunopkginstall.xml
+ rmdir --ignore-fail-on-non-empty
/usr/lib/libreoffice/basis-link/share/config
+ rmdir --ignore-fail-on-non-empty
/usr/lib/libreoffice/basis-link/share
+ rmdir --ignore-fail-on-non-empty /usr/lib/libreoffice/basis-link
fi
# move a already-filled in javasettingsunopkginstall.xml to the new
=== renamed file 'openoffice.org-common.triggers' =>
'openoffice.org-common.triggers.in'
--- a/openoffice.org-common.triggers 2010-09-14 18:51:46 +0000
+++ b/openoffice.org-common.triggers.in 2010-10-04 17:54:30 +0000
@@ -1,1 +1,1 @@
-interest /usr/lib/openoffice/share/extensions
+interest /@OOBRANDDIR@/share/extensions
=== modified file 'openoffice.org-core.bug-script.in'
--- a/openoffice.org-core.bug-script.in 2010-02-02 23:10:41 +0000
+++ b/openoffice.org-core.bug-script.in 2010-10-04 17:54:30 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
# list all installed extensions. --shared and non-shared
-/usr/lib/openoffice/program/unopkg list --shared >&3
-/usr/lib/openoffice/program/unopkg list >&3
+/usr/lib/libreoffice/program/unopkg list --shared >&3
+/usr/lib/libreoffice/program/unopkg list >&3
=== modified file 'openoffice.org-dev.preinst.in'
--- a/openoffice.org-dev.preinst.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-dev.preinst.in 2010-10-04 17:54:30 +0000
@@ -5,8 +5,8 @@
#INCLUDE_SHELL_LIB#
case "$1" in install|upgrade)
- if [ -L /usr/lib/openoffice/sdk/classes/com ]; then
- rm /usr/lib/openoffice/sdk/classes/com
+ if [ -L /usr/lib/libreoffice/sdk/classes/com ]; then
+ rm /usr/lib/libreoffice/sdk/classes/com
fi
;;
esac
=== modified file 'openoffice.org-filter-mobiledev.preinst.in'
--- a/openoffice.org-filter-mobiledev.preinst.in 2010-04-21 21:30:48
+0000
+++ b/openoffice.org-filter-mobiledev.preinst.in 2010-10-04 17:54:30
+0000
@@ -5,9 +5,9 @@
#INCLUDE_SHELL_LIB#
case "$1" in install|upgrade)
- if [ -L /usr/lib/openoffice/program/classes ]; then
- rm /usr/lib/openoffice/program/classes
- mkdir /usr/lib/openoffice/program/classes
+ if [ -L /usr/lib/libreoffice/program/classes ]; then
+ rm /usr/lib/libreoffice/program/classes
+ mkdir /usr/lib/libreoffice/program/classes
fi
;;
esac
=== modified file 'openoffice.org-java-common.preinst.in'
--- a/openoffice.org-java-common.preinst.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-java-common.preinst.in 2010-10-04 17:54:30 +0000
@@ -5,9 +5,9 @@
#INCLUDE_SHELL_LIB#
case "$1" in install|upgrade)
- if [ -L /usr/lib/openoffice/program/classes ]; then
- rm /usr/lib/openoffice/program/classes
- mkdir /usr/lib/openoffice/program/classes
+ if [ -L /usr/lib/libreoffice/program/classes ]; then
+ rm /usr/lib/libreoffice/program/classes
+ mkdir /usr/lib/libreoffice/program/classes
fi
;;
esac
=== modified file 'openoffice.org-mysql-connector.bug-script.in'
--- a/openoffice.org-mysql-connector.bug-script.in 2010-02-02 23:10:41
+0000
+++ b/openoffice.org-mysql-connector.bug-script.in 2010-10-04 17:54:30
+0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared
com.sun.star.mysql-connector-ooo-$PLATFORMID >&3
+/usr/lib/libreoffice/program/unopkg list --shared
com.sun.star.mysql-connector-ooo-$PLATFORMID >&3
=== modified file 'openoffice.org-mysql-connector.preinst.in'
--- a/openoffice.org-mysql-connector.preinst.in 2010-09-13 18:55:15 +0000
+++ b/openoffice.org-mysql-connector.preinst.in 2010-10-04 17:54:30 +0000
@@ -6,7 +6,7 @@
case "$1" in
upgrade)
- if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~beta~dev300m84; then
+ if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~; then
remove_extension
com.sun.star.mysql-connector-ooo-$PLATFORMID
fi
;;
=== modified file 'openoffice.org-officebean.preinst.in'
--- a/openoffice.org-officebean.preinst.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-officebean.preinst.in 2010-10-04 17:54:30 +0000
@@ -5,9 +5,9 @@
#INCLUDE_SHELL_LIB#
case "$1" in install|upgrade)
- if [ -L /usr/lib/openoffice/program/classes ]; then
- rm /usr/lib/openoffice/program/classes
- mkdir /usr/lib/openoffice/program/classes
+ if [ -L /usr/lib/libreoffice/program/classes ]; then
+ rm /usr/lib/libreoffice/program/classes
+ mkdir /usr/lib/libreoffice/program/classes
fi
;;
esac
=== modified file 'openoffice.org-pdfimport.bug-script.in'
--- a/openoffice.org-pdfimport.bug-script.in 2010-02-02 23:10:41 +0000
+++ b/openoffice.org-pdfimport.bug-script.in 2010-10-04 17:54:30 +0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared
com.sun.star.pdfimpo...@platformid@ >&3
+/usr/lib/libreoffice/program/unopkg list --shared
com.sun.star.pdfimpo...@platformid@ >&3
=== modified file 'openoffice.org-pdfimport.preinst.in'
--- a/openoffice.org-pdfimport.preinst.in 2010-09-13 18:55:15 +0000
+++ b/openoffice.org-pdfimport.preinst.in 2010-10-04 17:54:30 +0000
@@ -6,7 +6,7 @@
case "$1" in
upgrade)
- if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~beta~dev300m84; then
+ if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~; then
remove_extension com.sun.star.PDFImport-$PLATFORMID
fi
;;
=== modified file 'openoffice.org-presentation-minimizer.bug-script.in'
--- a/openoffice.org-presentation-minimizer.bug-script.in 2010-02-02
23:10:41 +0000
+++ b/openoffice.org-presentation-minimizer.bug-script.in 2010-10-04
17:54:30 +0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared
com.sun.star.presentationminimiz...@platformid@ >&3
+/usr/lib/libreoffice/program/unopkg list --shared
com.sun.star.presentationminimiz...@platformid@ >&3
=== modified file 'openoffice.org-presentation-minimizer.preinst.in'
--- a/openoffice.org-presentation-minimizer.preinst.in 2010-09-13 18:55:15
+0000
+++ b/openoffice.org-presentation-minimizer.preinst.in 2010-10-04 17:54:30
+0000
@@ -6,10 +6,10 @@
case "$1" in
upgrade)
- if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~beta~dev300m84; then
+ if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~; then
if dpkg --compare-versions $2 lt
1.0+OOo3.0.0~beta2~beb300m3; then
# this is a legacy package, so we need to find
it first...
- id=`/usr/lib/openoffice/program/unopkg list
--shared | grep Identifier:.*presentation-minimizer | cut -d":" -f2`
+ id=`/usr/lib/libreoffice/program/unopkg list
--shared | grep Identifier:.*presentation-minimizer | cut -d":" -f2`
else
id=com.sun.star.PresentationMinimizer-$PLATFORMID
fi
=== modified file 'openoffice.org-presenter-console.bug-script.in'
--- a/openoffice.org-presenter-console.bug-script.in 2010-02-02 23:10:41
+0000
+++ b/openoffice.org-presenter-console.bug-script.in 2010-10-04 17:54:30
+0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared
com.sun.presenterscre...@platformid@ >&3
+/usr/lib/libreoffice/program/unopkg list --shared
com.sun.presenterscre...@platformid@ >&3
=== modified file 'openoffice.org-presenter-console.preinst.in'
--- a/openoffice.org-presenter-console.preinst.in 2010-09-13 18:55:15
+0000
+++ b/openoffice.org-presenter-console.preinst.in 2010-10-04 17:54:30
+0000
@@ -6,7 +6,7 @@
case "$1" in
upgrade)
- if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~beta~dev300m84; then
+ if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~; then
remove_extension com.sun.PresenterScreen-$PLATFORMID
fi
;;
=== modified file 'openoffice.org-report-builder.bug-script.in'
--- a/openoffice.org-report-builder.bug-script.in 2010-02-02 23:10:41
+0000
+++ b/openoffice.org-report-builder.bug-script.in 2010-10-04 17:54:30
+0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared com.sun.reportdesigner >&3
+/usr/lib/libreoffice/program/unopkg list --shared com.sun.reportdesigner >&3
=== modified file 'openoffice.org-report-builder.preinst.in'
--- a/openoffice.org-report-builder.preinst.in 2010-09-13 18:55:15 +0000
+++ b/openoffice.org-report-builder.preinst.in 2010-10-04 17:54:30 +0000
@@ -6,7 +6,7 @@
case "$1" in
upgrade)
- if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~beta~dev300m84; then
+ if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~; then
remove_extension com.sun.reportdesigner
fi
;;
=== modified file 'openoffice.org-sdbc-postgresql.bug-script.in'
--- a/openoffice.org-sdbc-postgresql.bug-script.in 2010-02-02 23:10:41
+0000
+++ b/openoffice.org-sdbc-postgresql.bug-script.in 2010-10-04 17:54:30
+0000
@@ -1,4 +1,4 @@
#!/bin/sh
# this is a legacy package, so we need to find it frst
-id=`/usr/lib/openoffice/program/unopkg list --shared | grep
Identifier:.*postgresql-sdbc | cut -d":" -f2`
-/usr/lib/openoffice/program/unopkg list --shared $id >&3
+id=`/usr/lib/libreoffice/program/unopkg list --shared | grep
Identifier:.*postgresql-sdbc | cut -d":" -f2`
+/usr/lib/libreoffice/program/unopkg list --shared $id >&3
=== modified file 'openoffice.org-sdbc-postgresql.preinst.in'
--- a/openoffice.org-sdbc-postgresql.preinst.in 2010-09-13 18:55:15 +0000
+++ b/openoffice.org-sdbc-postgresql.preinst.in 2010-10-04 17:54:30 +0000
@@ -6,9 +6,9 @@
case "$1" in
upgrade)
- if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~beta~dev300m84; then
+ if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~; then
# this is a legacy package, so we need to find it
first...
- id=`/usr/lib/openoffice/program/unopkg list --shared |
grep Identifier:.*postgresql-sdbc | cut -d":" -f2`
+ id=`/usr/lib/libreoffice/program/unopkg list --shared |
grep Identifier:.*postgresql-sdbc | cut -d":" -f2`
remove_extension $id
fi
;;
=== modified file 'openoffice.org-wiki-publisher.bug-script.in'
--- a/openoffice.org-wiki-publisher.bug-script.in 2010-02-02 23:10:41
+0000
+++ b/openoffice.org-wiki-publisher.bug-script.in 2010-10-04 17:54:30
+0000
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/openoffice/program/unopkg list --shared com.sun.wiki-publisher >&3
+/usr/lib/libreoffice/program/unopkg list --shared com.sun.wiki-publisher >&3
=== modified file 'openoffice.org-wiki-publisher.preinst.in'
--- a/openoffice.org-wiki-publisher.preinst.in 2010-09-13 18:55:15 +0000
+++ b/openoffice.org-wiki-publisher.preinst.in 2010-10-04 17:54:30 +0000
@@ -6,7 +6,7 @@
case "$1" in
upgrade)
- if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~beta~dev300m84; then
+ if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt
OOo3.3.0~; then
remove_extension com.sun.wiki-publisher
fi
;;
=== modified file 'openoffice.org-writer.preinst.in'
--- a/openoffice.org-writer.preinst.in 2010-04-21 21:30:48 +0000
+++ b/openoffice.org-writer.preinst.in 2010-10-04 17:54:30 +0000
@@ -5,9 +5,9 @@
#INCLUDE_SHELL_LIB#
case "$1" in install|upgrade)
- if [ -L /usr/lib/openoffice/program/classes ]; then
- rm /usr/lib/openoffice/program/classes
- mkdir /usr/lib/openoffice/program/classes
+ if [ -L /usr/lib/libreoffice/program/classes ]; then
+ rm /usr/lib/libreoffice/program/classes
+ mkdir /usr/lib/libreoffice/program/classes
fi
;;
esac
=== modified file 'rules'
--- a/rules 2010-10-04 15:44:42 +0000
+++ b/rules 2010-10-04 17:54:30 +0000
@@ -41,7 +41,7 @@
SHELL:=/bin/bash
PKGDIR:=debian/openoffice.org$(VER)
-OODIRNAME=openoffice$(VER)
+OODIRNAME=libreoffice$(VER)
OOBRANDDIR:=usr/lib/$(OODIRNAME)
OOBASISDIR:=$(OOBRANDDIR)/basis$(BASIS_VERSION)
OOSDKDIR:=$(OOBASISDIR)/sdk
@@ -321,7 +321,7 @@
--with-system-dicts \
--with-additional-sections="$(ADDITIONAL_SECTIONS)"
-#CONFIGURE_FLAGS += --with-git
+CONFIGURE_FLAGS += --with-git
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
@@ -1949,7 +1949,7 @@
endif
cp -a ext-sources-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
- cp -a archive-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
+ #cp -a archive-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
ifneq ($(GCC_VERSION),)
ifneq ($(GCC_VERSION),snapshot)
@@ -2341,6 +2341,14 @@
find debian/tmp ! -perm -200 | xargs -r chmod u+w
+ # move them into -core for proper installation later in install-arch.
+ # The "rest" (arch-indep) is in -common anyways
+ for i in mysql-connector-ooo pdfimport presenter-screen
presentation-minimizer; do \
+ mkdir -p $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions; \
+ mv $(PKGDIR)-common/$(OOBRANDDIR)/share/extensions/$$i \
+ $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions; \
+ done
+
touch $@
#
@@ -2353,7 +2361,7 @@
# generate maintainer scripts from *.in
for PKG in $(PACKAGES); do \
- for FILE in postinst postrm preinst prerm; do \
+ for FILE in postinst postrm preinst prerm triggers; do \
MAINTSCRIPT=debian/$$PKG.$$FILE ; \
if [ -e $$MAINTSCRIPT.in ]; then \
sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e
'/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
@@ -2817,7 +2825,7 @@
mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/classes/win
mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/classes/com/sun/star/lib/loader
mkdir -p $(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/com/sun/star/lib/loader
- mv
$(PKGDIR)-dev/usr/share/openoffice/sdk/classes/com/sun/star/lib/loader/* \
+ mv
$(PKGDIR)-dev/usr/share/libreoffice/sdk/classes/com/sun/star/lib/loader/* \
$(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/com/sun/star/lib/loader && \
mv $(PKGDIR)-dev/usr/share/$(OODIRNAME)/sdk/classes/win \
$(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes
@@ -2828,7 +2836,7 @@
done
ln -s $(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e
s/lib/share/)/classes/win/unowinreg.dll \
$(PKGDIR)-dev/$(OOSDKDIR)/classes/win/unowinreg.dll
- rm -rf $(PKGDIR)-dev/usr/share/openoffice/sdk
+ rm -rf $(PKGDIR)-dev/usr/share/libreoffice/sdk
endif
chmod 644 $(PKGDIR)-dev/$(OOSDKDIR)/configure.pl
for i in csh csh.in; do \
@@ -2940,34 +2948,20 @@
mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
$(PKGDIR)-report-builder-bin/$(OODIR)/program
endif
- ifeq "$(ENABLE_JAVA)" "y"
- # install this; we need to register this ourselves later in
- # the maintainer scripts. This is intended upstream (*rpt* stuff
- # 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/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/extensions/report-builder.oxt/$$i;
\
- done
- endif
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
rm -rf $(PKGDIR)-presentation-minimizer
- 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
+ mkdir -p $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions
+ mv $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions/presentation-minimizer
\
+ $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions
endif
ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
rm -rf $(PKGDIR)-presenter-console
- 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
+ mkdir -p $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extensions
+ mv $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions/presenter-screen \
+ $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extensions
endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
@@ -2979,16 +2973,16 @@
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
rm -rf $(PKGDIR)-mysql-connector
- 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
+ mkdir -p $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions
+ mv $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo \
+ $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
rm -rf $(PKGDIR)-pdfimport
- 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
+ mkdir -p $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions
+ mv $(PKGDIR)-core/$(OOBRANDDIR)/share/extensions/pdfimport \
+ $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions
endif
# move services.rdb to /var/lib/openoffice
@@ -3427,12 +3421,29 @@
ln -s /$(OOSDKDIR)/index.html index.html
endif
+ifeq "$(PACKAGE_REPORTDESIGN)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
+ # install this; we need to register this ourselves later in
+ # the maintainer scripts. This is intended upstream (*rpt* stuff
+ # 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/extensions
+ mv $(PKGDIR)-common/$(OOBRANDDIR)/share/extensions/report-builder \
+ $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions
+ # unneeded license files
+ for i in THIRDPARTYREADMELICENSE.html readme_en-US.html
readme_en-US.txt; do \
+ rm -f
$(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions/report-builder/$$i; \
+ done
+ endif
+endif
+
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -rf $(PKGDIR)-wiki-publisher
- 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/extensions/wiki-publisher.oxt/license/THIRDPARTYLICENSEREADME.html
+ mkdir -p $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions
+ mv $(PKGDIR)-common/$(OOBRANDDIR)/share/extensions/wiki-publisher \
+ $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions
+ rm -f
$(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
endif
# add version to .lintian-overrides
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-09-20 22:46:57 +0000
+++ b/shell-lib-extensions.sh 2010-10-04 17:54:30 +0000
@@ -1,17 +1,17 @@
flush_unopkg_cache() {
- /usr/lib/openoffice/program/unopkg list --shared > /dev/null 2>&1
+ /usr/lib/libreoffice/program/unopkg list --shared > /dev/null 2>&1
}
remove_extension() {
- if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then
+ if /usr/lib/libreoffice/program/unopkg list --shared $1 >/dev/null; then
INSTDIR=`mktemp -d`
export PYTHONPATH="/@OOBASISDIR@/program"
- if [ -L /usr/lib/openoffice/basis-link ]; then
- d=/var/lib/openoffice/`readlink /usr/lib/openoffice/basis-link`/
+ if [ -L /usr/lib/libreoffice/basis-link ]; then
+ d=/var/lib/libreoffice/`readlink /usr/lib/libreoffice/basis-link`/
else
- d=/usr/lib/openoffice
+ d=/usr/lib/libreoffice
fi
- /usr/lib/openoffice/program/unopkg remove -v --shared $1 \
+ /usr/lib/libreoffice/program/unopkg remove -v --shared $1 \
"-env:UserInstallation=file://$INSTDIR" \
"-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml"
\
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
@@ -21,13 +21,13 @@
}
validate_extensions() {
- /usr/lib/openoffice/program/unopkg validate -v --shared
+ /usr/lib/libreoffice/program/unopkg validate -v --shared
}
sync_extensions() {
- if [ -e /usr/lib/openoffice/share/prereg/bundled ] && readlink
/usr/lib/openoffice/share/prereg/bundled 2>&1 >/dev/null; then
- /usr/lib/openoffice/program/unopkg sync -v --shared \
-
"-env:BUNDLED_EXTENSIONS_USER=file:///usr/lib/openoffice/share/prereg/bundled" \
+ if [ -e /usr/lib/libreoffice/share/prereg/bundled ] && readlink
/usr/lib/libreoffice/share/prereg/bundled 2>&1 >/dev/null; then
+ /usr/lib/libreoffice/program/unopkg sync -v --shared \
+
"-env:BUNDLED_EXTENSIONS_USER=file:///usr/lib/libreoffice/share/prereg/bundled"
\
"-env:UserInstallation=file://$INSTDIR" \
"-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml"
\
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
