[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.4-2-4-g0d20633
The following commit has been merged in the master branch:
commit 0d206336800b0faa7cffec7266304b0b59fbe6c0
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Mon Jul 8 20:54:39 2013 +0200
prepare for python3-defaults 3.3 change; move back to python3-uno
diff --git a/changelog b/changelog
index 1febc6e..8409b6c 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:4.0.4-3) UNRELEASED; urgency=low
* debian/rules:
- also filter out binutils so that the mips(el)-only build-dep doesn't
end up in -subsequentbases depends for everything
+ * debian/rules, debian/control.in:
+ - revert python3-uno -> python3.3-uno move now that python 3.3 is default
+ and prefer python3-uno (>= 4.0~) in dependencies again
-- Rene Engelhard <rene@debian.org> Wed, 19 Jun 2013 20:57:09 +0200
diff --git a/control b/control
index dcedf42..ab7a666 100644
--- a/control
+++ b/control
@@ -111,7 +111,7 @@ Build-Depends: ant (>= 1.7.0),
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
python3,
- python3.3-dev (>= 3.3),
+ python3-dev (>= 3.3),
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
@@ -166,7 +166,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -720,11 +720,10 @@ Description: Python-UNO bridge (support for old python 2)
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.
+ to python 3 yet. Prefer python3-uno over this.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: python3.3-uno
-#Provides: ${python3:Provides}
+Package: python3-uno
Section: python
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Enhances: libreoffice
@@ -732,9 +731,9 @@ Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2)
-Replaces: python3-uno (<< 1:4.0.2~rc2)
-Provides: python3-uno
+Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+Replaces: python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+Provides: ${python3:Provides}
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -4569,7 +4568,7 @@ Depends: ant (>= 1.7.0),
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
python3,
- python3.3-dev (>= 3.3),
+ python3-dev (>= 3.3),
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
diff --git a/control.in b/control.in
index fd7e312..4e571c6 100644
--- a/control.in
+++ b/control.in
@@ -583,11 +583,10 @@ Description: Python-UNO bridge (support for old python 2)
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.
+ to python 3 yet. Prefer python3-uno over this.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: python3.3-uno
-#Provides: ${python3:Provides}
+Package: python3-uno
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreoffice
@@ -595,9 +594,9 @@ Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2)
-Replaces: python3-uno (<< 1:4.0.2~rc2)
-Provides: python3-uno
+Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+Replaces: python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+Provides: ${python3:Provides}
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 38f7fa4..7894d46 100755
--- a/rules
+++ b/rules
@@ -128,8 +128,7 @@ 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!
-# Also note that you need to adapt all package names...
-PYTHON_VERSION=3.3
+PYTHON_VERSION=current
ifeq "$(PYTHON_VERSION)" "current"
PYTHON=python3
export PYTHON=python3
@@ -670,7 +669,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.3-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
ifeq "$(ENABLE_PYTHON2)" "y"
PY2MAJOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[0]")
PY2MINOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]")
@@ -681,8 +680,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.3-uno. see "OMG!" below :-)
-PYTHON_SITE:=debian/python3.3-uno/$(shell $(PYTHON2) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+# YES, really! python3-uno. see "OMG!" below :-)
+PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON2) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
PYTHON:=$(PYTHON2)
endif
@@ -1127,7 +1126,7 @@ else
endif
ifneq "$(ENABLE_PYTHON)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno -Npython3.3-uno -Nlibreoffice-script-provider-python
+ DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno -Nlibreoffice-script-provider-python
ifeq "$(BUILD_ISOS)" "en-US"
CONFIGURE_FLAGS += --disable-python
else
@@ -1135,10 +1134,10 @@ ifneq "$(ENABLE_PYTHON)" "y"
endif
else
ifeq "$(WHEEZY_BACKPORT)" "y"
- DEBHELPER_OPTIONS+= -Npython3.3-uno
+ DEBHELPER_OPTIONS+= -Npython3-uno
PYUNO_DEPENDS = python-uno
else
- PYUNO_DEPENDS = python3.3-uno | python3-uno (>= 4.0~) | python-uno
+ PYUNO_DEPENDS = python3-uno (>= 4.0~) | python3.3-uno | python-uno
endif
endif
@@ -2279,15 +2278,15 @@ endif
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
install -d $(PYTHON_SITE)
- 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
+ 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
( 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.3-uno/$(OODIR)/program/pythonloader.unorc
- chmod u-w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
+ ) > debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u-w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
install -d $(PYTHON2_SITE)
@@ -2298,7 +2297,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.3-uno/$(OODIR)/program/pythonloader.unorc \
+ cat debian/python3-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 \
@@ -2309,11 +2308,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.3-uno/$(OODIR)/program/pythonloader.py \
+ cp debian/python3-uno/$(OODIR)/program/pythonloader.py \
debian/python-uno/$(OODIR)/program
- cp debian/python3.3-uno/$(OODIR)/share/registry/pyuno.xcd \
+ cp debian/python3-uno/$(OODIR)/share/registry/pyuno.xcd \
debian/python-uno/$(OODIR)/share/registry
- cp -r debian/python3.3-uno/$(OODIR)/share/Scripts/python \
+ cp -r debian/python3-uno/$(OODIR)/share/Scripts/python \
debian/python-uno/$(OODIR)/share/Scripts
endif
endif
@@ -2321,13 +2320,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.3-uno/usr/share/doc/python3.3-uno
+ mkdir -p debian/python3-uno/usr/share/doc/python3-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
- debian/python3.3-uno/usr/share/doc/python3.3-uno; \
+ debian/python3-uno/usr/share/doc/python3-uno; \
for i in $(SOURCE_TREE)/pyuno/doc/*; do \
- cp $$i debian/python3.3-uno/usr/share/doc/python3.3-uno; \
+ cp $$i debian/python3-uno/usr/share/doc/python3-uno; \
done
- cd debian/python3.3-uno/usr/share/doc/python3.3-uno && \
+ cd debian/python3-uno/usr/share/doc/python3-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
@@ -2346,7 +2345,7 @@ endif
ifeq "$(WHEEZY_BACKPORT)" "y"
# OMG!!
rm -rf debian/python-uno
- mv debian/python3.3-uno debian/python-uno
+ mv debian/python3-uno debian/python-uno
endif
# should be empty now, remove if there
@@ -2902,14 +2901,14 @@ endif
ifeq "$(WHEEZY_BACKPORT)" "y"
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
else
- dh_python3 -ppython3.3-uno --no-guessing-deps
+ dh_python3 -ppython3-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.3-uno.substvars
+ debian/python3-uno.substvars
else
sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR).$(PYMINOR)/g' \
- debian/python3.3-uno.substvars
+ debian/python3-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 dfc7595..c3b8657 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.3-uno
+create_package_directory gid_Module_Optional_Pyuno pkg/python3-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
Reply to: