[libreoffice] 02/02: Merge remote-tracking branch 'origin/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 98b5b0ec92dd1d965d0a1db4df76b5718b48d780
Merge: 8f4218a 6d8ddbf
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Mar 19 21:19:17 2017 +0100

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

 changelog      | 6 +++++-
 control        | 4 +++-
 control.sdk.in | 3 ++-
 rules          | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --cc changelog
index 8622665,1ddd3b6..02ab87e
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,12 +1,14 @@@
 -libreoffice (1:5.2.6-2) unstable; urgency=medium
 +libreoffice (1:5.3.2~rc1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
  
-  -- Rene Engelhard <rene at debian.org>  Fri, 17 Mar 2017 14:14:43 +0100
+   * debian/rules:
+     - move /usr/include/libreoffice/sal/typesizes.h symlink to -dev
+       instead of -dev-common (closes: #858199)
+ 
+  -- Rene Engelhard <rene at debian.org>  Sun, 19 Mar 2017 19:11:37 +0100
  
 -libreoffice (1:5.2.6-1) unstable; urgency=medium
 +libreoffice (1:5.3.1-1) experimental; urgency=medium
  
    * New upstream release
  
diff --cc control
index c87db2f,52398b1..df1bbba
--- a/control
+++ b/control
@@@ -4376,8 -4372,10 +4376,10 @@@ Depends: libreoffice-core (= ${binary:V
  Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
  Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
  Replaces: libreoffice-common (<< 1:4.1.0~beta1),
-           libreoffice-core (<< 1:4.1.0~beta1)
+           libreoffice-core (<< 1:4.1.0~beta1),
 -          libreoffice-dev-common (<< 1:5.2.6-2)
++          libreoffice-dev-common (<< 1:5.3.2~)
  Conflicts: libreoffice (<< 1:5.2.5-2~), libreoffice-dev-doc (<< 1:5.2.5-2~)
 -Breaks: libreoffice-dev-common (<< 1:5.2.6-2)
++Breaks: libreoffice-dev-common (<< 1:5.3.2~)
  Description: office productivity suite -- SDK -- architecture-dependent parts
   LibreOffice is a full-featured office productivity suite that provides
   a near drop-in replacement for Microsoft(R) Office.
diff --cc control.sdk.in
index aa64eb0,3c6e42a..98226ed
--- a/control.sdk.in
+++ b/control.sdk.in
@@@ -9,8 -9,9 +9,9 @@@ Depends: libreoffice-core (= ${binary:V
           ${shlibs:Depends}
  Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
  Suggests: libmythes-dev, libreofficekit-dev, libreoffice-dev-doc
- Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1)
 -Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1), libreoffice-dev-common (<< 1:5.2.6-2)
++Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1), libreoffice-dev-common (<< 1:5.3.2~)
  Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~), libreoffice (<< 1:5.2.5-2~)
 -Breaks: libreoffice-dev-common (<< 1:5.2.6-2)
++Breaks: libreoffice-dev-common (<< 1:5.3.2~)
  Description: office productivity suite -- SDK -- architecture-dependent parts
   LibreOffice is a full-featured office productivity suite that provides
   a near drop-in replacement for Microsoft(R) Office.

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