[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. 4e2fa7a62b65ed8f59d8ad71ecb28de28e275df8
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 5b8014cf98cfea00837ac0a70da3371bba266aed
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 4 15:19:56 2011 +0200
fix Scripts/ installation
diff --git a/rules b/rules
index 110cb53..1a7a486 100755
--- a/rules
+++ b/rules
@@ -2970,20 +2970,17 @@ ifeq "$(ENABLE_JAVA)" "y"
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/$(OOBRANDDIR)/share/Scripts
+ mkdir -p $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
mv $(PKGDIR)-common/$(OODIR)/share/Scripts/beanshell \
- $(PKGDIR)-script-provider-bsh/$(OODIR)/Scripts
+ $(PKGDIR)-script-provider-bsh/$(OODIR)/share/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
- 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
- mkdir -p $(PKGDIR)-script-provider-js/$(OOBRANDDIR)/share/Scripts
+ mkdir -p $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
mv $(PKGDIR)-common/$(OODIR)/share/Scripts/javascript \
- $(PKGDIR)-script-provider-js/$(OODIR)/Scripts
+ $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
--
LibreOffice packaging repository
Reply to: