The following commit has been merged in the debian-experimental-3.5 branch:
commit bc3df45c8572a853456c62fa3825b66c42652f3b
Author: Rene Engelhard <[email protected]>
Date: Thu Nov 10 19:47:17 2011 +0000
install the extensions already via gid2pkgdirs.sh
diff --git a/rules b/rules
index 45b531e..e7b91c0 100755
--- a/rules
+++ b/rules
@@ -2450,20 +2450,9 @@ else
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
- rm -rf $(PKGDIR)-presentation-minimizer
- mkdir -p $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions
- mv debian/tmp/$(OOBRANDDIR)/share/extensions/presentation-minimizer \
- $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions
rm -f
$(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions/presentation-minimizer/registration/LICENSE
endif
-ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- rm -rf $(PKGDIR)-presenter-console
- mkdir -p $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extensions
- mv debian/tmp/$(OOBRANDDIR)/share/extensions/presenter-screen \
- $(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extensions
-endif
-
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
rm -rf $(PKGDIR)-sdbc-postgresql
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)
@@ -2472,18 +2461,10 @@ ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- rm -rf $(PKGDIR)-mysql-connector
- mkdir -p $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions
- mv debian/tmp/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo \
- $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions
rm -f
$(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo/registration/LICENSE
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- rm -rf $(PKGDIR)-pdfimport
- mkdir -p $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions
- mv debian/tmp/$(OOBRANDDIR)/share/extensions/pdfimport \
- $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions
rm -f
$(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions/pdfimport/registration/LICENSE
endif
@@ -2841,11 +2822,6 @@ endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
ifeq "$(ENABLE_JAVA)" "y"
- rm -rf $(PKGDIR)-report-builder
- mkdir -p $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions
- mv debian/tmp/$(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 \
registration/LICENSE; do \
rm -f
$(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions/report-builder/$$i; \
@@ -2854,10 +2830,6 @@ ifeq "$(ENABLE_REPORTDESIGN)" "y"
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- rm -rf $(PKGDIR)-wiki-publisher
- mkdir -p $(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extensions
- mv debian/tmp/$(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
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 48b3b52..8554113 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -77,6 +77,12 @@ create_package_directory gid_Module_Optional_Testtool
pkg/libreoffice-
create_package_directory gid_Module_Root_SDK
pkg/libreoffice-dev
create_package_directory
gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
pkg/libreoffice-script-provider-bsh
create_package_directory
gid_Module_Optional_Extensions_Script_Provider_For_Javascript
pkg/libreoffice-script-provider-js
+create_package_directory gid_Module_Optional_Extensions_MEDIAWIKI
pkg/librepffice-wiki-publisher
+create_package_directory gid_Module_Optional_Extensions_MINIMIZER
pkg/libreoffice-presentation-minimizer
+create_package_directory gid_Module_Optional_Extensions_MySQLConnector
pkg/libreoffice-mysql-connector
+create_package_directory gid_Module_Optional_Extensions_PDFIMPORT
pkg/libreoffice-pdfimport
+create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN
pkg/libreoffice-presenter-console
+create_package_directory gid_Module_Optional_Extensions_REPORTDESIGN
pkg/libreoffice-report-builder
move_wrappers pkg/libreoffice-common soffice unopkg
move_wrappers pkg/libreoffice-common libreoffice lofromtemplate
move_wrappers pkg/libreoffice-base lobase
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
