[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-4.3' into debian-experimental-4.4
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit 81b32a28bee649ff6215f0993bd1b11d00768e94
Merge: ea0caab 410d8fe
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 30 15:42:07 2014 -0700
Merge remote-tracking branch 'origin/debian-experimental-4.3' into debian-experimental-4.4
Conflicts:
control
changelog | 9 +++++----
control | 68 +++++++++++++++++++++++++++++++--------------------------------
rules | 2 +-
3 files changed, 40 insertions(+), 39 deletions(-)
diff --cc control
index abba7b2,7c375af..eff5623
--- a/control
+++ b/control
@@@ -728,9 -729,33 +728,9 @@@ Description: office productivity suite
* libreoffice-evolution: Evolution addressbook support
* evolution
-Package: python-uno
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Section: oldlibs
-Priority: extra
-Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el
-Enhances: libreoffice
-Depends: libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${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)
- 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-uno over this.
-Homepage: http://udk.openoffice.org/python/python-bridge.html
-
Package: python3-uno
Section: python
- Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64
+ Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: