The following commit has been merged in the debian-experimental-4.0 branch:
commit feb9aaa6c44d50b039f7d42b5d073f9bfa0c8425
Author: Rene Engelhard <r...@debian.org>
Date: Tue Mar 19 18:19:51 2013 +0100
temporarily rename python3-uno -> python3.3-uno; mention obsoleteness of
python-uno
diff --git a/changelog b/changelog
index f97fcbf..2e69879 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,12 @@ libreoffice (1:4.0.2~rc1-2) UNRELEASED; urgency=low
* merge from Ubuntu:
- reverting l10n conflicts as they create an unfortunate mess in image and
installer creation (related: lp#957589)
+ * debian/rules, debian/control.in:
+ - temporarily rename python3-uno to python3.3-uno to be able to upload
+ this to unstable without waiting for a python3-defaults transition.
+ * debian/control.in:
+ - mention that python-uno is for old python2 compatibility and move to
+ oldlibs
-- Rene Engelhard <r...@debian.org> Wed, 13 Mar 2013 02:07:52 +0100
diff --git a/control b/control
index 07f4f09..834e7da 100644
--- a/control
+++ b/control
@@ -107,7 +107,7 @@ Build-Depends: ant (>= 1.7.0),
pkg-config,
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
- python3-dev (>= 3.3),
+ python3.3-dev (>= 3.3),
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
@@ -683,7 +683,7 @@ Description: office productivity suite -- GNOME integration
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
-Section: python
+Section: oldlibs
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386
mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}),
@@ -691,16 +691,19 @@ Depends: libreoffice-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends}
Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
-Conflicts: python3-uno
-Description: Python-UNO bridge
+Conflicts: python3-uno, python3.3-uno
+Description: Python-UNO bridge (support for old python 2)
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
others to develop UNO components in Python, thus Python UNO components
may be run within the LibreOffice process and can be called from C++
or the built in StarBasic scripting language.
+ .
+ This package is for compatibility with applications/libraries not ported
+ to python 3 yet. Prefer python3.3-uno over this.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: python3-uno
+Package: python3.3-uno
Section: python
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386
mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Enhances: libreoffice
@@ -708,7 +711,9 @@ Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Conflicts: python-uno
+Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2)
+Replaces: python3-uno (<< 1:4.0.2~rc2)
+Provides: python3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --git a/control.in b/control.in
index ba24c2e..8591a39 100644
--- a/control.in
+++ b/control.in
@@ -580,7 +580,7 @@ Description: office productivity suite -- GNOME integration
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
-Section: python
+Section: oldlibs
Architecture: %OOO_ARCHS%
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}),
@@ -588,16 +588,19 @@ Depends: libreoffice-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends}
Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
-Conflicts: python3-uno
-Description: Python-UNO bridge
+Conflicts: python3-uno, python3.3-uno
+Description: Python-UNO bridge (support for old python 2)
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
others to develop UNO components in Python, thus Python UNO components
may be run within the LibreOffice process and can be called from C++
or the built in StarBasic scripting language.
+ .
+ This package is for compatibility with applications/libraries not ported
+ to python 3 yet. Prefer python3.3-uno over this.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: python3-uno
+Package: python3.3-uno
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreoffice
@@ -605,7 +608,9 @@ Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Conflicts: python-uno
+Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2)
+Replaces: python3-uno (<< 1:4.0.2~rc2)
+Provides: python3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --git a/rules b/rules
index e53972d..dc922b8 100755
--- a/rules
+++ b/rules
@@ -100,7 +100,8 @@ endif
# uses pythonX.Y directly (and the dh_pycentral-created dependencies allow
# also the non-working default python then) - see e.g. #587402. Also
# note we are NOT working with python < 2.6 anymore!
-PYTHON_VERSION=current
+# Also note that you need to adapt all package names...
+PYTHON_VERSION=3.3
ifeq "$(PYTHON_VERSION)" "current"
PYTHON=python3
export PYTHON=python3
@@ -628,7 +629,7 @@ ifneq "$(WHEEZY_BACKPORT)" "y"
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/python3-uno/$(shell $(PYTHON) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
+PYTHON_SITE:=debian/python3.3-uno/$(shell $(PYTHON) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
PY2MAJOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[0]")
PY2MINOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]")
PY2MINORPLUS1:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]+1")
@@ -637,8 +638,8 @@ else
PYMAJOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[0])")
PYMINOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[1])")
PYMINORPLUS1:=$(shell $(PYTHON2) -c "import sys; print
(sys.version_info[1]+1)")
-# YES, really! python3-uno. see "OMG!" below :-)
-PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON2) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
+# YES, really! python3.3-uno. see "OMG!" below :-)
+PYTHON_SITE:=debian/python3.3-uno/$(shell $(PYTHON2) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
PYTHON:=$(PYTHON2)
endif
@@ -1084,7 +1085,7 @@ else
endif
ifneq "$(ENABLE_PYTHON)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno
-Nlibreoffice-script-provider-python
+ DEBHELPER_OPTIONS+= -Npython-uno -Npython3.3-uno
-Nlibreoffice-script-provider-python
ifeq "$(BUILD_ISOS)" "en-US"
CONFIGURE_FLAGS += --disable-python
else
@@ -1092,10 +1093,10 @@ ifneq "$(ENABLE_PYTHON)" "y"
endif
else
ifeq "$(WHEEZY_BACKPORT)" "y"
- DEBHELPER_OPTIONS+= -Npython3-uno
+ DEBHELPER_OPTIONS+= -Npython3.3-uno
PYUNO_DEPENDS = python-uno
else
- PYUNO_DEPENDS = python3-uno (>= 4.0~) | python-uno
+ PYUNO_DEPENDS = python3.3-uno (>= 4.0~) | python-uno
endif
endif
@@ -2190,15 +2191,15 @@ endif
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
install -d $(PYTHON_SITE)
- mv debian/python3-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
- mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
- touch debian/python3-uno/$(OODIR)/program/pythonloader.unorc
- chmod u+w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ mv debian/python3.3-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
+ mv debian/python3.3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
+ touch debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u+w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
( echo '[Bootstrap]'; \
echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages
$$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
- ) > debian/python3-uno/$(OODIR)/program/pythonloader.unorc
- chmod u-w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ ) > debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u-w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
install -d $(PYTHON2_SITE)
@@ -2209,7 +2210,7 @@ ifeq "$(ENABLE_PYTHON)" "y"
mkdir -p debian/python-uno/$(OODIR)/program
mkdir -p debian/python-uno/$(OODIR)/share/registry
mkdir -p debian/python-uno/$(OODIR)/share/Scripts
- cat debian/python3-uno/$(OODIR)/program/pythonloader.unorc \
+ cat debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc \
| sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY2MAJOR).$(PY2MINOR)/" \
> debian/python-uno/$(OODIR)/program/pythonloader.unorc
for i in py2uno.so libpy2uno.so; do \
@@ -2220,11 +2221,11 @@ ifeq "$(ENABLE_PYTHON)" "y"
install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/python2loader.uno.so \
debian/python-uno/$(OODIR)/program/python2loader.uno.so
ln -s python2loader.uno.so
debian/python-uno/$(OODIR)/program/pythonloader.uno.so
- cp debian/python3-uno/$(OODIR)/program/pythonloader.py \
+ cp debian/python3.3-uno/$(OODIR)/program/pythonloader.py \
debian/python-uno/$(OODIR)/program
- cp debian/python3-uno/$(OODIR)/share/registry/pyuno.xcd \
+ cp debian/python3.3-uno/$(OODIR)/share/registry/pyuno.xcd \
debian/python-uno/$(OODIR)/share/registry
- cp -r debian/python3-uno/$(OODIR)/share/Scripts/python \
+ cp -r debian/python3.3-uno/$(OODIR)/share/Scripts/python \
debian/python-uno/$(OODIR)/share/Scripts
endif
endif
@@ -2232,13 +2233,13 @@ ifeq "$(ENABLE_PYTHON)" "y"
rm -f
debian/libreoffice-script-provider-python/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
endif
- mkdir -p debian/python3-uno/usr/share/doc/python3-uno
+ mkdir -p debian/python3.3-uno/usr/share/doc/python3.3-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
- debian/python3-uno/usr/share/doc/python3-uno; \
+ debian/python3.3-uno/usr/share/doc/python3.3-uno; \
for i in $(SOURCE_TREE)/pyuno/doc/*; do \
- cp $$i debian/python3-uno/usr/share/doc/python3-uno; \
+ cp $$i debian/python3.3-uno/usr/share/doc/python3.3-uno; \
done
- cd debian/python3-uno/usr/share/doc/python3-uno && \
+ cd debian/python3.3-uno/usr/share/doc/python3.3-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
@@ -2257,7 +2258,7 @@ endif
ifeq "$(WHEEZY_BACKPORT)" "y"
# OMG!!
rm -rf debian/python-uno
- mv debian/python3-uno debian/python-uno
+ mv debian/python3.3-uno debian/python-uno
endif
# should be empty now, remove if there
@@ -2805,14 +2806,14 @@ endif
ifeq "$(WHEEZY_BACKPORT)" "y"
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
else
- dh_python3 -ppython3-uno --no-guessing-deps
+ dh_python3 -ppython3.3-uno --no-guessing-deps
# adds a python3 (>= 3.2.3-3~)
ifeq "$(PYTHON_VERSION)" "current"
sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR) (>= 3.3~)/g' \
- debian/python3-uno.substvars
+ debian/python3.3-uno.substvars
else
sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR).$(PYMINOR)/g' \
- debian/python3-uno.substvars
+ debian/python3.3-uno.substvars
endif
ifeq "$(ENABLE_PYTHON2)" "y"
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index c3b8657..dfc7595 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -97,7 +97,7 @@ create_package_directory gid_Module_Brand_Prg_Draw
pkg/libreoffice-
create_package_directory gid_Module_Brand_Prg_Wrt
pkg/libreoffice-writer
create_package_directory gid_Module_Brand_Prg_Impress
pkg/libreoffice-impress
create_package_directory gid_Module_Brand_Prg_Base
pkg/libreoffice-base
-create_package_directory gid_Module_Optional_Pyuno pkg/python3-uno
+create_package_directory gid_Module_Optional_Pyuno
pkg/python3.3-uno
create_package_directory gid_Module_Optional_Pyuno_LibreLogo
pkg/libreoffice-librelogo
create_package_directory
gid_Module_Optional_Extensions_Script_Provider_For_Python
pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome
pkg/libreoffice-gnome
--
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/e1uimp9-0000fn...@vasks.debian.org
