./packages/openofficeorg/3.1/experimental r1517: * debian/rules:
------------------------------------------------------------
revno: 1517
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2009-04-30 01:06:41 +0200
message:
* debian/rules:
- move python version setting before the python conditionals deciding
thanks Chris Cheney
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.135
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2009-04-30 01:04:11 +0200
message:
* debian/rules:
- move python version setting before the python conditionals deciding
whether to apply Python26 patchset or not, thanks Chris Cheney
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-04-29 22:54:52 +0000
+++ b/changelog 2009-04-29 23:06:41 +0000
@@ -1,3 +1,11 @@
+openoffice.org (1:3.1.0~rc2-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - move python version setting before the python conditionals deciding
+ thanks Chris Cheney
+
+ -- Rene Engelhard <rene@debian.org> Thu, 30 Apr 2009 01:02:53 +0200
+
openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low
* OpenOffice.org 3.1.0 rc2 (OOO310_m11)
=== modified file 'rules'
--- a/rules 2009-04-28 22:10:17 +0000
+++ b/rules 2009-04-29 23:06:41 +0000
@@ -486,6 +486,12 @@
ARCH_FLAGS += -O0
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())')
+
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(USE_PYCENTRAL)" "y"
BUILD_DEPS += , python-central (>= 0.5)
@@ -975,12 +981,6 @@
# breaks. At least with 2
# CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS)
-# 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())')
-
CURDIR ?= $(shell pwd)
ifeq ($(GCC_VERSION),)
Reply to: