The following commit has been merged in the debian-experimental-3.5 branch:
commit 11222f70729248e5448e4c3d0a542a47cad0740a
Author: Rene Engelhard <[email protected]>
Date: Thu Nov 10 18:14:58 2011 +0000
install gid_Module_Optional_Extensions_Script_Provider_For_* into the
correct locations already with gid2pkgdirs.sh
diff --git a/rules b/rules
index bce0224..45b531e 100755
--- a/rules
+++ b/rules
@@ -2295,15 +2295,10 @@ ifeq "$(BUILD_PYUNO)" "y"
done
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
- mkdir -p debian/python-uno/$(OOBRANDDIR)/share/extensions
- mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python
\
- debian/python-uno/$(OOBRANDDIR)/share/extensions
- rm -f
debian/python-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
ifeq "$(ENABLE_PYTHON3)" "y"
mkdir -p debian/python3-uno/$(OOBRANDDIR)/share/extensions
- mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python
\
+ cp -ra debian/python-uno/$(OOBRANDDIR)/share/extensions/* \
debian/python3-uno/$(OOBRANDDIR)/share/extensions
- rm -f
debian/python3-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
endif
endif
@@ -2844,33 +2839,6 @@ ifeq "$(PACKAGE_SDK)" "y"
ln -s /$(OOSDKDIR)/index.html index.html
endif
-ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
- rm -rf $(PKGDIR)-script-provider-bsh
- mkdir -p $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
- mv
debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell \
- $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
- rm -f
$(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell/registration/LICENSE
- ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
- ln -sf /usr/share/java/bsh.jar \
-
$(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell/bsh.jar
- endif
- mkdir -p $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
- mv $(PKGDIR)-common/$(OODIR)/share/Scripts/beanshell \
- $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
- endif
-
- ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
- rm -rf $(PKGDIR)-script-provider-js
- mkdir -p $(PKGDIR)-script-provider-js/$(OOBRANDDIR)/share/extensions
- mv
debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-javascript \
- $(PKGDIR)-script-provider-js/$(OOBRANDDIR)/share/extensions
- mkdir -p $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
- mv $(PKGDIR)-common/$(OODIR)/share/Scripts/javascript \
- $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
- endif
-endif
-
ifeq "$(ENABLE_REPORTDESIGN)" "y"
ifeq "$(ENABLE_JAVA)" "y"
rm -rf $(PKGDIR)-report-builder
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 1be717a..48b3b52 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -64,6 +64,7 @@ create_package_directory gid_Module_Brand_Prg_Wrt
pkg/libreoffice-
create_package_directory gid_Module_Brand_Prg_Impress
pkg/libreoffice-impress
create_package_directory gid_Module_Brand_Prg_Base
pkg/libreoffice-base
create_package_directory gid_Module_Optional_Pyuno pkg/python-uno
+create_package_directory
gid_Module_Optional_Extensions_Script_Provider_For_Python
pkg/python-uno
create_package_directory gid_Module_Optional_Gnome
pkg/libreoffice-gnome
create_package_directory gid_Module_Optional_Kde
pkg/libreoffice-kde
create_package_directory gid_Module_Root_Files_2
pkg/libreoffice-common
@@ -74,6 +75,8 @@ create_package_directory gid_Module_Root_Files_6
pkg/libreoffice-
create_package_directory gid_Module_Root_Files_7
pkg/libreoffice-common
create_package_directory gid_Module_Optional_Testtool
pkg/libreoffice-qa-tools
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
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]
