The following commit has been merged in the debian-experimental-3.7 branch:
commit 59f74949f44a26b8ef6f096e60e278772d472783
Author: Rene Engelhard <[email protected]>
Date: Fri Nov 16 22:32:26 2012 +0100
patch py3uno before make py3uno.clean as otherwise pyuno get cleaned...
diff --git a/rules b/rules
index bd3b05a..0bbf13f 100755
--- a/rules
+++ b/rules
@@ -1595,14 +1595,12 @@ ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(ENABLE_PYTHON3)" "y"
rm -rf $(SOURCE_TREE)/py3uno
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py3uno
- $(MAKE) py3uno.clean
- ifeq "$(PYTHON3_VERSION)" "current"
cd py3uno && \
patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python3.diff
+ $(MAKE) py3uno.clean
+ ifeq "$(PYTHON3_VERSION)" "current"
make cmd cmd='cd py3uno; export PYTHON=$(PYTHON3); export
PYTHON_CFLAGS="$(shell pkg-config --cflags python$(PY3MAJOR))"; export
PYTHON_LIBS="$(shell pkg-config --libs python$(PY3MAJOR))"; $(MAKE)'
else
- cd py3uno && \
- patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python3.diff
make cmd cmd='cd py3uno; export PYTHON=$(PYTHON3); export
PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR))";
export PYTHON_LIBS="$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR))";
$(MAKE)'
endif
endif
--
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]
