[libreoffice] 03/03: 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 e36fcf3aaf0c6711204617448ca3aa5353c4aead
Merge: 49c97c7 72e8531
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 9 18:04:26 2014 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.3' into debian-experimental-4.4
Conflicts:
rules
changelog | 9 +++++++++
control | 25 ++++++++++++-------------
control.gltf.in | 11 +++++++++++
control.in | 12 ------------
libreoffice-base.postrm.in | 2 +-
rules | 3 +++
6 files changed, 36 insertions(+), 26 deletions(-)
diff --cc control
index 857af8c,eff0688..a2ed417
--- a/control
+++ b/control
@@@ -184,11 -183,12 +184,11 @@@ Build-Conflicts: amd-libopencl1
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-XS-Python-Version: current
XS-Python3-Version: 3.4
XS-Testsuite: autopkgtest
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-4.4
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
@@@ -4574,3 -4624,3 +4562,14 @@@ Description: Logo-like progamming langu
- Python data structures (list, tuple, set, dictionary) and other Python
features
++Package: libreoffice-avmedia-backend-opengl
++Section: misc
++Priority: optional
++Architecture: alpha amd64 armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64 s390 s390x sparc
++Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
++Replaces: libreoffice-core (<< 1:4.2~)
++Description: OpenGL support for avmedia
++ LibreOffice is a full-featured office productivity suite that provides
++ a near drop-in replacement for Microsoft(R) Office.
++ .
++ This package contains some OpenGL support for avmedia. FIXME: more precise.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: