[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-7-145-gb3266da
The following commit has been merged in the debian-experimental-3.6 branch:
commit b3266da90a00d140fc5e8dad094754575e7a9099
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 14 00:02:15 2012 +0200
use python3.pc
This reverts 8d53c725025f9f3030fdafc4da491b02696eccc2
diff --git a/changelog b/changelog
index a9c7bba..bf4f6c1 100644
--- a/changelog
+++ b/changelog
@@ -31,6 +31,7 @@ libreoffice (1:3.6.0-1) UNRELEASED; urgency=low
add the new --disable-extensions and --disable-database-connectivity to
their respective places
- split build into build-{arch,indep}
+ - use generic python3.pc instead of pythonX.Y(mu).pc
* debian/uno-libs3.symbols: update
[Björn Michaelsen]
diff --git a/rules b/rules
index f66c5d5..bef87f5 100755
--- a/rules
+++ b/rules
@@ -662,7 +662,7 @@ ifeq "$(BUILD_PYUNO)" "y"
DBG_DBG_SUGGESTS+= , python-dbg
BUILD_DEPS += , $(PYTHON)-dev (>= 2.6)
ifeq "$(ENABLE_PYTHON3)" "y"
- BUILD_DEPS += , $(PYTHON3)-dev (>= 3.2)
+ BUILD_DEPS += , $(PYTHON3)-dev
endif
else
BUILD_DEPS += , python
@@ -1602,7 +1602,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).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) ../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
Reply to: