[libreoffice] 01/02: Merge remote-tracking branch 'origin/debian-experimental-5.4' 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 2fc26e791e2c2f23a4b4d77675d770ee88981664
Merge: 489486f fe5e199
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Sep 24 10:21:27 2017 +0200

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

 changelog                          | 2 --
 control                            | 2 --
 libreoffice-core.lintian-overrides | 1 +
 rules                              | 5 -----
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --cc libreoffice-core.lintian-overrides
index 0000000,dc3c149..3a4d1d8
mode 000000,100644..100644
--- a/libreoffice-core.lintian-overrides
+++ b/libreoffice-core.lintian-overrides
@@@ -1,0 -1,2 +1,1 @@@
 -libreoffice-core: embedded-library usr/lib/libreoffice/program/libpdfiumlo.so: lcms2
+ libreoffice-core: embedded-library usr/lib/libreoffice/program/libpdfiumlo.so: openjpeg

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