The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 3a57b8263a539d4058d06600de53f5b4fa641d7b
Author: Rene Engelhard <[email protected]>
Date: Sun May 29 22:20:20 2011 +0000
s/spaces/tabs/, oops
diff --git a/rules b/rules
index 2914419..c2211c3 100755
--- a/rules
+++ b/rules
@@ -2408,9 +2408,9 @@ ifeq "$(BUILD_PYUNO)" "y"
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages
$$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
) > debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u-w debian/python-uno/$(OODIR)/program/pythonloader.unorc
- mkdir -p debian/python-uno/$(OOBRANDDIR)/share/extensions
- mv
debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python \
- debian/python-uno/$(OOBRANDDIR)/share/extensions
+ mkdir -p debian/python-uno/$(OOBRANDDIR)/share/extensions
+ mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python
\
+ debian/python-uno/$(OOBRANDDIR)/share/extensions
mkdir -p debian/python-uno/usr/share/doc/python-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
@@ -2974,10 +2974,10 @@ ifeq "$(PACKAGE_SDK)" "y"
endif
ifeq "$(ENABLE_JAVA)" "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 -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
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
ln -sf /usr/share/java/bsh.jar \
$(PKGDIR)-script-provider-bsh/$(OODIR)/program/classes/bsh.jar
@@ -2986,10 +2986,10 @@ ifeq "$(ENABLE_JAVA)" "y"
mv $(PKGDIR)-common/$(OODIR)/share/Scripts/beanshell \
$(PKGDIR)-script-provider-bsh/$(OODIR)/Scripts
- 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
+ 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)/program/classes
mv $(PKGDIR)-java-common/$(OODIR)/program/classes/js.jar \
$(PKGDIR)-script-provider-js/$(OODIR)/program/classes
--
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]
