[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3

[Rene Engelhard]

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

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

commit 7aa018224c4a1c4b74e9638cf02d96ec6c6e6d98
Merge: 9b5cef1 6ce6b69
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Nov 17 12:20:30 2016 +0100

    Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3

 changelog                      | 2 ++
 libreoffice-common.maintscript | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --cc changelog
index c3e5fe6,ff31eae..0931ffd
--- a/changelog
+++ b/changelog
@@@ -21,9 -33,6 +21,11 @@@ libreoffice (1:5.3.0~beta1~git20161101-
        Bump Build-Dependency on libmysqlcppconn to >= 1.1.7-4 to go sure
        we're getting a >= 1.1.7 dependency
        Fix adding the libmysqlcppconn-dev Build-Dep in the default case
 +  * debian/control.in:
 +    - add Breaks: browser-plugin-libreoffice to libreoffice-core
 +      (closes: #843980)
++  * debian/libreoffice-common.maintscript: remove apparently uneeded quotes
++    which now breaks at dpkg-maintscript-helper call...
  
   -- Rene Engelhard <rene at debian.org>  Tue, 15 Nov 2016 22:02:43 +0100
  

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