This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit a28f0b6512a29328f993dee8c1ecd3e3ca9579e4
Merge: 262e1f2 e38eaea
Author: Rene Engelhard <r...@debian.org>
Date: Wed Apr 6 12:55:19 2016 +0200
Merge branch 'debian-experimental-5.1' into debian-experimental-5.2
Conflicts:
control
rules
tests/control
changelog | 11 +-
control | 6 +-
control.sdk.in | 4 +-
patches/liborcus-0.11.diff | 2412 ++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
rules | 4 +-
tests/control | 2 +-
tests/sdk-examples | 2 +-
8 files changed, 2431 insertions(+), 11 deletions(-)
diff --cc patches/series
index e43f183,60ef4dd..2f5bbb0
--- a/patches/series
+++ b/patches/series
@@@ -28,5 -29,10 +28,6 @@@ hppa-is-32bit.dif
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
-disable-npapi-plugin-support.diff
-gcc-6.diff
GCC-6-PR69273-workaround.diff
-bash-completion-dir.diff
-OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
+ liborcus-0.11.diff
diff --cc tests/control
index db2e07f,9253814..9ca3a02
--- a/tests/control
+++ b/tests/control
@@@ -1,5 -1,5 +1,5 @@@
Tests: junit-subsequentcheck
- Depends: libreoffice, libreoffice-subsequentcheckbase,
libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex
(>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev,
libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev,
libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev,
libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev
, libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~ [...]
-Depends: libreoffice, libreoffice-subsequentcheckbase,
libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex
(>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev,
libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev,
libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev,
libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev
, libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~ [...]
++Depends: libreoffice, libreoffice-subsequentcheckbase,
libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex
(>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev,
libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev,
libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev,
libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev
, libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~ [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
