------------------------------------------------------------
revno: 1422
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2009-03-10 16:22:59 +0100
message:
fix PYTHON_SITE for python2.6 (print(sysconfig.get_python_lib())
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-03-03 17:45:05 +0000
+++ b/changelog 2009-03-10 15:22:59 +0000
@@ -1,7 +1,7 @@
-openoffice.org (1:3.0.1-4.5pre) unstable; urgency=low
+openoffice.org (1:3.0.1-4.5pre) unstable; urgency=high
* ooo-build:
- - update (r15439)
+ - update (r15496)
* debian/shell-lib.sh:
- $ORIGIN -> $OOO_BASE_DIR
* debian/presubj:
@@ -12,8 +12,10 @@
* debian/control.in:
- remove http://udk.openoffice.org/python/python-bridge.html from
python-unos description, we already have it in Homepage:
-
- -- Rene Engelhard <r...@debian.org> Tue, 03 Mar 2009 02:09:05 +0100
+ * merge from Ubuntu:
+ - fix PYTHON_SITE for python2.6 (print(sysconfig.get_python_lib())
+
+ -- Rene Engelhard <r...@debian.org> Tue, 10 Mar 2009 02:32:23 +0100
openoffice.org (1:3.0.1-4) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-02-28 11:22:52 +0000
+++ b/rules 2009-03-10 15:22:59 +0000
@@ -8,7 +8,7 @@
# Authors:
# Chris Halls <ha...@debian.org>
# Rene Engelhard <r...@debian.org>
-# Copyright 2002-2008 Software in the Public Interest, Inc.
+# Copyright 2002-2009 Software in the Public Interest, Inc.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
################################################################################
@@ -968,7 +968,7 @@
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/usr/lib/python$(PYMAJOR).$(PYMINOR)/site-packages
+PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
CURDIR ?= $(shell pwd)
