[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-3-42-g5131819
The following commit has been merged in the debian-experimental-3.5 branch:
commit 513181902c6b60e636e14da67fa0e87e0b19cc8a
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 16 22:00:40 2012 +0100
determine PYMAJOR etc from PYTHON/PYTHON3, not the hardocded default python/python3
diff --git a/changelog b/changelog
index 74e9788..2baf81e 100644
--- a/changelog
+++ b/changelog
@@ -7,7 +7,8 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
0.21.0 and fix the test with 0.20.x, thanks Pino Toscano
* debian/rules:
- - use generic python3.pc instead of pythonX.Y(mu).pc
+ - use generic python3.pc in default case instead of pythonX.Y.pc.
+ Use pythonX.Y.pc otherwise and actually make version-switching work.
- hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
extremely slowing down the install target...
- document truth and remove alpha from supported architectures
diff --git a/rules b/rules
index b110cce..8a95407 100755
--- a/rules
+++ b/rules
@@ -621,15 +621,14 @@ ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
endif
-# Build python depends from current python version
-PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
-PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]")
-PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1")
-PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
-PY3MAJOR:=$(shell python3 -c "import sys; print (sys.version_info[0])")
-PY3MINOR:=$(shell python3 -c "import sys; print (sys.version_info[1])")
-PY3MINORPLUS1:=$(shell python3 -c "import sys; print (sys.version_info[1]+1)")
-PYTHON3_SITE:=debian/python3-uno/$(shell python3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PYMAJOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
+PYMINOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]")
+PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]+1")
+PYTHON_SITE:=debian/python-uno/$(shell $PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PY3MAJOR:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[0])")
+PY3MINOR:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[1])")
+PY3MINORPLUS1:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[1]+1)")
+PYTHON3_SITE:=debian/python3-uno/$(shell $(PYTHON3) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
ifeq "$(BUILD_PYUNO)" "y"
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
--
LibreOffice packaging repository
Reply to: