[libreoffice] 01/02: Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit c3049fc452d7e57158ecebd22079e54929e32f9e
Merge: 26a02a6 4b682d6
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jul 29 14:37:13 2017 +0000

    Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

 changelog                                                  |  7 ++++++-
 control                                                    |  6 +++---
 control.in                                                 |  7 +++----
 libreoffice-dev.lintian-overrides                          |  1 -
 patches/build-against-shared-lpsolve.diff                  |  7 +++----
 ...ff => disable-some-sc-tests-with-internal-cppunit.diff} | 14 +++++++++++++-
 patches/series                                             |  2 +-
 rules                                                      |  7 -------
 8 files changed, 29 insertions(+), 22 deletions(-)

diff --cc patches/series
index 09e85b0,1f29fcc..b476ede
--- a/patches/series
+++ b/patches/series
@@@ -25,5 -26,10 +25,5 @@@ hppa-is-32bit.dif
  no-packagekit-per-default.diff
  system-officeotron-and-odfvalidator.diff
  no-openssl.diff
- disable-sc_subsequent_filters_test-with-internal-cppunit.diff
+ disable-some-sc-tests-with-internal-cppunit.diff
  cppunit-optional.diff
 -disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -examples-fix-SDK_AUTO_DEPLOYMENT-check.diff
 -libebook-1.2.so.19.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git