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

[Rene Engelhard]

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

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

commit a68b7f57f7568412cc8d4e2326a8427dc1452d59
Merge: 53116a2 019cb7e
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 13 20:04:51 2017 +0100

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

 changelog                 | 18 +++++++++++++
 control                   |  7 +++--
 control.sdk.in            |  5 ++--
 libreoffice-dev-doc.links |  2 +-
 lo-cpp-ref.in             |  2 +-
 lo-idl-ref.in             |  2 +-
 lo-java-ref.in            |  2 +-
 rules                     | 66 +++++++++++++++++++++++++++++++++++++----------
 8 files changed, 83 insertions(+), 21 deletions(-)

diff --cc changelog
index 67487ce,03c1168..4c4e8d1
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,21 +1,27 @@@
 +libreoffice (1:5.4.0~alpha0~git20170213-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 +
+ libreoffice (1:5.3.0-2) UNRELEASED; urgency=medium
+ 
+   * debian/rules, debian/libreoffice-dev-doc.links, debian/lo*.in:
+     install SDK documentation into /usr/share/doc/libreoffice/sdk (and adapt
+     dev-docs symlinks/doc-base stuff). Remove extra license file (thanks
+     lintian) which otherwise would still install over the symlink.
+   * debian/control.sdk.in: update -devs libreoffice-dev-doc Conflicts to
+     (<< 1:5.2.5-2~) and add Conflicts: libreoffice (<< 1:5.2.5-2~) to both
+     -dev*- for safety
+   * debian/rules:
+     - enable mergelibs only on 64bit archs (and i386), ld goes to OOM on
+       mips(el) for example...
+     - allow build with gold (maybe for LTO?)
+     - ignore "libreoffice" for --link-doc
+     - fix dh_installdocs calls to install copyright for "libreoffice"
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 02 Feb 2017 09:04:43 +0100
+ 
  libreoffice (1:5.3.0-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