[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-160-gbd2ee49



The following commit has been merged in the debian-experimental-3.5 branch:
commit 6fb98db73800262e0ffbce20fc315b4cb4f99961
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Dec 17 21:40:48 2011 +0100

    more python3-uno installation fixes

diff --git a/rules b/rules
index 4c7ac46..3a7c8be 100755
--- a/rules
+++ b/rules
@@ -2277,12 +2277,13 @@ ifeq "$(BUILD_PYUNO)" "y"
 		$(PYTHON3_SITE)
 	cp $(PYTHON_SITE)/unohelper.py \
 		$(PYTHON3_SITE)
+	mkdir -p debian/python3-uno/$(OODIR)/program
 	cat debian/python-uno/$(OODIR)/program/pythonloader.unorc \
 		| sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
 		> debian/python3-uno/$(OODIR)/program/pythonloader.unorc
 	for i in pyuno.so pythonloader.uno.so libpyuno.so; do \
 		install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/$$i \
-			debian/python3-uno/$(OODIR)/$$i; \
+			debian/python3-uno/$(OODIR)/program/$$i; \
 	done
   endif
   ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"

-- 
LibreOffice packaging repository


Reply to: