------------------------------------------------------------
revno: 1432
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2009-03-10 22:42:12 +0100
message:
make python-uno buildable against specific python; merge
modified:
changelog
control.in
openoffice.org-gcj.postinst.in
openoffice.org-gcj.postrm.in
rules
------------------------------------------------------------
revno: 1332.1.90
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
------------------------------------------------------------
revno: 1332.1.91
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2009-03-10 18:23:43 +0100
message:
|| true on rebuild-gcj-db call
modified:
changelog
openoffice.org-gcj.postinst.in
openoffice.org-gcj.postrm.in
=== modified file 'changelog'
--- a/changelog 2009-03-10 00:49:56 +0000
+++ b/changelog 2009-03-10 21:42:12 +0000
@@ -10,7 +10,7 @@
(closes: #512644)
- new orig without rfc314.txt (closes: #516784)
* ooo-build:
- - back on trunk (r15513)
+ - back on trunk (r15513 - ooo-build 3.0.99.1)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -52,13 +52,15 @@
* debian/rules, debian/scripts/openoffice-xlate-lang:
- add openoffice-xlate-lang symlink in debian/scripts, use
debian/scripts/openoffice-xlate-lang
-
- -- Rene Engelhard <r...@debian.org> Tue, 10 Mar 2009 01:49:53 +0100
-
-openoffice.org (1:3.0.1-4.5pre) unstable; urgency=low
+ * debian/rules, debian/control.in: add support for building against an other
+ python than the "current" (default) one
+
+ -- Rene Engelhard <r...@debian.org> Tue, 10 Mar 2009 18:33:55 +0100
+
+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:
@@ -69,8 +71,11 @@
* debian/control.in:
- remove http://udk.openoffice.org/python/python-bridge.html from
python-unos description, we already have it in Homepage:
+ * merge from Ubuntu:
+ - fix PYTHON_SITE for python2.6 (print(sysconfig.get_python_lib())
+ - Update rebuild-gcj-db snippet.
- -- Rene Engelhard <r...@debian.org> Tue, 03 Mar 2009 02:09:05 +0100
+ -- Rene Engelhard <r...@debian.org> Tue, 10 Mar 2009 18:22:17 +0100
openoffice.org (1:3.0.1-4) unstable; urgency=low
=== modified file 'control.in'
--- a/control.in 2009-03-03 22:29:11 +0000
+++ b/control.in 2009-03-10 21:42:12 +0000
@@ -51,7 +51,7 @@
%BUILD_DEPS%
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
-XS-Python-Version: current
+XS-Python-Version: @PYTHON_VERSION@
Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
Vcs-Svn: %OOO_BUILD_SVN%
Homepage: http://www.go-oo.org
=== modified file 'openoffice.org-gcj.postinst.in'
--- a/openoffice.org-gcj.postinst.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-gcj.postinst.in 2009-03-10 17:23:43 +0000
@@ -10,7 +10,7 @@
#INCLUDE_SHELL_LIB#
if [ -x /usr/bin/rebuild-gcj-db ]; then
- /usr/bin/rebuild-gcj-db
+ /usr/bin/rebuild-gcj-db || true
fi
#DEBHELPER#
=== modified file 'openoffice.org-gcj.postrm.in'
--- a/openoffice.org-gcj.postrm.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-gcj.postrm.in 2009-03-10 17:23:43 +0000
@@ -10,7 +10,7 @@
#INCLUDE_SHELL_LIB#
if [ -x /usr/bin/rebuild-gcj-db ]; then
- /usr/bin/rebuild-gcj-db
+ /usr/bin/rebuild-gcj-db || true
fi
#DEBHELPER#
=== modified file 'rules'
--- a/rules 2009-03-06 23:59:57 +0000
+++ b/rules 2009-03-10 21:42:12 +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>.
################################################################################
@@ -89,6 +89,12 @@
BUILD_DEPS=
BUILD_PYUNO=y
USE_PYCENTRAL=y
+PYTHON_VERSION=current
+ifeq "$(PYTHON_VERSION)" "current"
+ PYTHON=python
+else
+ PYTHON=python$(PYTHON_VERSION)
+endif
# causes out-of-memory
ifeq "$(JDK)" "openjdk-cacao"
PACKAGE_QA_TOOLS=n
@@ -491,11 +497,19 @@
BUILD_DEPS += , python-central (>= 0.5)
endif
DBG_DBG_SUGGESTS+= , python-dbg
- ifeq "$(PYMAJOR).$(PYMINOR)" "2.6"
+ ifeq "$(PYTHON_VERSION)" "current"
+ ifeq "$(PYMAJOR).$(PYMINOR)" "2.6"
ADDITIONAL_SECTIONS += Python26
BUILD_DEPS += , python-dev (>= 2.6)
- else
+ else
BUILD_DEPS += , python-dev (>= 2.4)
+ endif
+ else
+ ifeq "$(PYTHON_VERSION)" "2.6"
+ ADDITIONAL_SECTIONS += Python26
+ endif
+ BUILD_DEPS += , python$(PYTHON_VERSION)-dev
+ CONFIGURE_FLAGS += PYTHON=$(PYTHON)
endif
else
BUILD_DEPS += , python
@@ -983,10 +997,10 @@
# 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/usr/lib/python$(PYMAJOR).$(PYMINOR)/site-packages
+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)
@@ -1227,6 +1241,7 @@
-e "s#%$(DIST)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
+ -e "s...@python_version@#$(PYTHON_VERSION)#g" \
< debian/control.in > debian/control
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
