The following commit has been merged in the ubuntu-raring-4.0 branch:
commit e63262a6699c5c3c71ddd8b19f1323215d1ae801
Author: Bjoern Michaelsen <[email protected]>
Date: Thu Mar 28 09:51:56 2013 +0100
Revert "temporarily rename python3-uno -> python3.3-uno; mention
obsoleteness of python-uno"
This reverts commit feb9aaa6c44d50b039f7d42b5d073f9bfa0c8425.
Conflicts:
changelog
control
control.in
rules
diff --git a/changelog b/changelog
index 822e60f..d3c3cc8 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,10 @@ libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa2) raring;
urgency=low
* make -emailmerge B/R consistent
* we have libservlet-3.0 already
+ * revert temp. python3-uno->python3.3-move that we dont need, while trying to
+ keep the diff low
- -- Bjoern Michaelsen <[email protected]> Thu, 28 Mar 2013
09:41:07 +0100
+ -- Bjoern Michaelsen <[email protected]> Thu, 28 Mar 2013
09:49:44 +0100
libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa1) raring; urgency=low
diff --git a/control b/control
index e69de29..8b13789 100644
--- a/control
+++ b/control
@@ -0,0 +1 @@
+
diff --git a/control.in b/control.in
index 298aa82..25ec475 100644
--- a/control.in
+++ b/control.in
@@ -585,7 +585,7 @@ Description: office productivity suite -- GNOME integration
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
-Section: oldlibs
+Section: python
Architecture: %OOO_ARCHS%
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}),
@@ -593,19 +593,16 @@ Depends: libreoffice-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends}
Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
-Conflicts: python3-uno, python3.3-uno
-Description: Python-UNO bridge (support for old python 2)
+Conflicts: 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
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.3-uno
+Package: python3-uno
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreoffice
diff --git a/rules b/rules
index 447e687..b0b0fb8 100755
--- a/rules
+++ b/rules
@@ -131,8 +131,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
@@ -688,7 +687,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())')
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")
@@ -697,8 +696,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
@@ -1150,7 +1149,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
@@ -1158,7 +1157,7 @@ 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
@@ -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
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
