------------------------------------------------------------
revno: 2039
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2010-06-28 16:38:53 +0200
message:
build for only the default python again
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2010-06-28 09:25:49 +0000
+++ b/changelog 2010-06-28 14:38:53 +0000
@@ -9,8 +9,10 @@
- fix builds without Java
- update smoketest conditional, enable smoketest uncoditionally when
building without Java
+ * debian/control.in, debian/rules:
+ - build for only the default python again (closes: #587402)
- -- Rene Engelhard <r...@debian.org> Mon, 28 Jun 2010 02:58:27 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 28 Jun 2010 16:09:13 +0200
openoffice.org (1:3.2.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-06-12 22:10:26 +0000
+++ b/control 2010-06-28 14:38:53 +0000
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev,
libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev,
libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl,
libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc,
imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0)
[s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>=
1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64
ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386
amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev, python-all ,
debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel
ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x
sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>=
1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alp
ha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386
mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64
ppc64 s390x sparc], libflut
e-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips m
ipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64
s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>=
3.12.3) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>=
2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>=
2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>=
2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>=
0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>=
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>=
0.8.3-
3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0)
, libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>=
4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java
(>= 2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>>
1.8.0.10) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60)
, libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>=
1.0.8) ,
libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev,
libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev,
libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl,
libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc,
imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0)
[s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>=
1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64
ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386
amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel ppc64 s390x sparc]
, gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>=
1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel
powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386
mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfr
eebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386
mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa
ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-lang-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java ,
libbase-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64
s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libflute-java-openo
ffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips mipsel powerp
c s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java ,
xulrunner-dev [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3)
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3)
[i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386
kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>= 2.4.2.3) [i386
kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386
kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev
(>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libmyth
es-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) ,
libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5)
, libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java
(>= 2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>>
1.8.0.10) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60)
, libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>=
1.0.8) , libgtk2.0-de
v (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (=
1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5)
Standards-Version: 3.8.4
-XS-Python-Version: >= 2.4
+XS-Python-Version: current
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.2.1/unstable
Homepage: http://www.go-oo.org
=== modified file 'control.in'
--- a/control.in 2010-06-12 22:07:58 +0000
+++ b/control.in 2010-06-28 14:38:53 +0000
@@ -49,7 +49,7 @@
Build-Depends-Indep: fdupes, xml-core, netpbm, %BUILD_DEPS_INDEP%
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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2)
[%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%]
Standards-Version: 3.8.4
-XS-Python-Version: >= 2.4
+XS-Python-Version: @PYTHON_VERSION@
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.2.1/unstable
Homepage: http://www.go-oo.org
=== modified file 'rules'
--- a/rules 2010-06-21 23:32:41 +0000
+++ b/rules 2010-06-28 14:38:53 +0000
@@ -101,6 +101,12 @@
BUILD_PYUNO=y
USE_PYCENTRAL=y
USE_PYSUPPORT=n
+PYTHON_VERSION=current
+ifeq "$(PYTHON_VERSION)" "current"
+ PYTHON=python
+else
+ PYTHON=python$(PYTHON_VERSION)
+endif
PACKAGE_TTF_OPENSYMBOL=y
ifneq "$(ARCH)" "powerpc"
ifneq "$(ARCH)" "ppc64"
@@ -738,6 +744,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)
@@ -750,7 +762,8 @@
endif
endif
DBG_DBG_SUGGESTS+= , python-dbg
- BUILD_DEPS += , python-dev, python-all
+ BUILD_DEPS += , $(PYTHON)-dev
+ CONFIGURE_FLAGS += PYTHON=$(PYTHON)
else
BUILD_DEPS += , python
endif
@@ -1636,6 +1649,7 @@
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
+ -e "s...@python_version@#$(PYTHON_VERSION)#g" \
< debian/control.in > debian/control
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
@@ -2405,7 +2419,7 @@
cp $$aotcompile_py debian/scripts
cd debian/scripts && \
patch -p0 < $(CURDIR)/debian/aotcompile-256M-default.diff
- PYTHONPATH="debian/scripts:$(shell python$$v -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')" \
+ PYTHONPATH="debian/scripts:$(shell echo $(PYTHON_SITE) | sed -e
s,debian/python-uno,,)" \
AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/openoffice \
debian/tmp/native-jars debian/tmp/native-jars/gcj
gcj-dbtool -n debian/tmp/native-jars/tmp.db 64
@@ -2715,17 +2729,13 @@
ifeq "$(BUILD_PYUNO)" "y"
# PyUNO packaging
- for v in `pyversions -sv`; do \
- PYTHON_SITE=`python$$v -c 'from distutils import sysconfig;
print(sysconfig.get_python_lib())'`; \
- install -d debian/python-uno/$$PYTHON_SITE; \
- install -m644 debian/python-uno/$(OODIR)/program/uno.py
debian/python-uno/$$PYTHON_SITE; \
- install -m464 debian/python-uno/$(OODIR)/program/unohelper.py
debian/python-uno/$$PYTHON_SITE; \
- done
- rm debian/python-uno/$(OODIR)/program/uno*py
+ install -d $(PYTHON_SITE)
+ mv debian/python-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
+ mv debian/python-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
touch debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u+w debian/python-uno/$(OODIR)/program/pythonloader.unorc
( echo '[Bootstrap]'; \
- echo 'PYTHONHOME=file:///usr/lib/$(shell pyversions -ds)'; \
+ echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages
$$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
) > debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u-w debian/python-uno/$(OODIR)/program/pythonloader.unorc
