The following commit has been merged in the debian-experimental-3.5 branch:
commit 4befd8f1e52816d039701267d94cd8c89890884e
Author: Rene Engelhard <r...@debian.org>
Date: Sat Dec 17 01:05:17 2011 +0100
fix python3-uno: proper substvar, run dh_python3 and install correct .sos
diff --git a/control b/control
index a577747..a5a1d49 100644
--- a/control
+++ b/control
@@ -368,12 +368,11 @@ Description: Python-UNO bridge
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: python3-uno
-Provides: ${python:Provides}, libreoffice-script-provider-python
-XB-Python-Version: ${python:Versions}
+Provides: libreoffice-script-provider-python
Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
-Depends: libreoffice-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), ${python3:Depends},
${shlibs:Depends}, ${misc:Depends}
Conflicts: python-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
diff --git a/control.in b/control.in
index 6dc812f..8f82e98 100644
--- a/control.in
+++ b/control.in
@@ -512,13 +512,12 @@ Description: Python-UNO bridge
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: python3-uno
-Provides: ${python:Provides}, libreofficeVER-script-provider-python
-XB-Python-Version: ${python:Versions}
+Provides: libreofficeVER-script-provider-python
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreofficeVER
Depends: libreofficeVER-core (= ${binary:Version}),
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends},
${misc:Depends}
Conflicts: python-uno
diff --git a/rules b/rules
index 54e330b..fd3c91c 100755
--- a/rules
+++ b/rules
@@ -2278,10 +2278,10 @@ ifeq "$(BUILD_PYUNO)" "y"
cp $(PYTHON_SITE)/unohelper.py \
$(PYTHON3_SITE)
cat debian/python-uno/$(OODIR)/program/pythonloader.unorc \
- sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
+ | sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
> debian/python3-uno/$(OODIR)/program/pythonloader.unorc
for i in pyuno.so pythonloader.uno.so libpyuno.so; do \
- install -m644 $(SOURCE_TREE)/pyuno/$(shell .
$(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/$$i \
+ install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell .
$(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/$$i \
debian/python3-uno/$(OODIR)/$$i; \
done
endif
@@ -2939,6 +2939,9 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
endif
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
+ifeq "$(ENABLE_PYTHON3)" "y"
+ dh_python3 -ppython3-uno --no-guessing-deps
+endif
dh_lintian -s
dh_bugfiles -s -A
dh_link -s
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rbhtb-0000ry...@vasks.debian.org
