The following commit has been merged in the debian-experimental-3.6 branch:
commit 3ca6b5dad35c384785d18af0d18217e33e1045a1
Author: Rene Engelhard <[email protected]>
Date: Sun Oct 28 14:34:59 2012 +0100
fix quoting of PYTHON_{CFLAGS,LIBS} (Matthias Klose)
diff --git a/changelog b/changelog
index a9fa361..fd0f222 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.6.3~rc2-2) UNRELEASED; urgency=low
+
+ * merge from Ubuntu:
+ - fix quoting of PYTHON_{CFLAGS,LIBS} (Matthias Klose)
+
+ -- Rene Engelhard <[email protected]> Sun, 28 Oct 2012 14:33:55 +0100
+
libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
* new upstream release candidate
diff --git a/rules b/rules
index 02eb1fa..f7d21d6 100755
--- a/rules
+++ b/rules
@@ -1585,7 +1585,7 @@ ifeq "$(BUILD_PYUNO)" "y"
. $(SOURCE_TREE)/config_host.mk.source; \
cd pyuno-py3 && \
rm -rf $$OUTPATH$$PROEXT; \
- PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags
python$(PY3MAJOR)) PYTHON_LIBS=$(shell pkg-config --libs python$(PY3MAJOR))
../solenv/bin/build.pl
+ PYTHON=$(PYTHON3) PYTHON_CFLAGS="$(shell pkg-config --cflags
python$(PY3MAJOR))" PYTHON_LIBS="$(shell pkg-config --libs python$(PY3MAJOR))"
../solenv/bin/build.pl
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]
