[libreoffice] 02/02: Merge branch 'master' 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 4ca062201df3f0e1cfcffa09c161248509c90497
Merge: c214940 e98679b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri May 26 15:50:08 2017 +0200

    Merge branch 'master' into debian-experimental-5.3
    
    Conflicts:
    	changelog
    	rules

 changelog | 1 +
 copyright | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --cc changelog
index be3cd5d,16c0ddc..548f65a
--- a/changelog
+++ b/changelog
@@@ -1,18 -1,10 +1,19 @@@
 -libreoffice (1:5.2.7-2) UNRELEASED; urgency=medium
 +libreoffice (1:5.3.3-2) UNRELEASED; urgency=medium
  
 +  * debian/rules:
 +    - fix logic error; make -g1 etc work also with noddebs. Build with those
 +      flags also if building no -dbgsym
 +    - move DPKG_EXPORT_BUILDFLAGS and buildflags.mk include later to make it
 +      effective (worked before, but...)
 +  * debian/control.in:
 +    - remove obsolete Pre-Depends
 +  * debian/rules, debian/control.in: remove now unneeded dejavu-depends substvar,
 +    simply use fonts-dejavu. Move from Depends: to Recommends: like the other fonts
+   * debian/copyright: fix (add missing .'s)
  
 - -- Rene Engelhard <rene at debian.org>  Thu, 04 May 2017 20:18:44 +0200
 + -- Rene Engelhard <rene at debian.org>  Sat, 20 May 2017 14:32:02 +0200
  
 -libreoffice (1:5.2.7-1) unstable; urgency=medium
 +libreoffice (1:5.3.3-1) experimental; urgency=medium
  
    * New upstream release
  

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