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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.2_rc1-1-51-g6348373



The following commit has been merged in the debian-experimental-3.7 branch:
commit 634837345047cb25c8d3a80b4e0e40b1caf9fb1c
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Sep 21 00:41:04 2012 +0200

    fix python3-uno install

diff --git a/rules b/rules
index 1b3e920..b1f3f9b 100755
--- a/rules
+++ b/rules
@@ -2223,13 +2223,14 @@ ifeq "$(BUILD_PYUNO)" "y"
 	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 py3uno.so python3loader.uno.so lib3pyuno.so; do \
+	for i in py3uno.so libpy3uno.so; do \
 		install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/$$i \
-			debian/python3-uno/$(OODIR)/program/`echo $$i | sed -e s/py3/py/`; \
-			ln -s `echo $$i | sed -e s/3//` debian/python3-uno/$(OODIR)/program/$$i; \
+			debian/python3-uno/$(OODIR)/program/$$i; \
+			ln -s $$i debian/python3-uno/$(OODIR)/program/`echo $$i | sed -e s/3//`; \
 	done
 	install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/python3loader.uno.so \
-		debian/python3-uno/$(OODIR)/program/pythonloader.uno.so
+		debian/python3-uno/$(OODIR)/program/python3loader.uno.so
+	ln -s python3loader.uno.so debian/python3-uno/$(OODIR)/program/pythonloader.uno.so
 	cp debian/python-uno/$(OODIR)/program/pythonloader.py \
 		debian/python3-uno/$(OODIR)/program
 	cp debian/python-uno/$(OODIR)/share/registry/pyuno.xcd \

-- 
LibreOffice packaging repository


Reply to: