[libreoffice] 01/02: Merge branch 'debian-experimental-5.2' into debian-experimental-5.3

[Rene Engelhard <rene@moszumanska.debian.org>]

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 53ea2c581fe18a161a00cdc0e9fe425aaa6fb079
Merge: 41f3671 cb1ff15
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Aug 15 16:18:39 2016 +0200

    Merge branch 'debian-experimental-5.2' into debian-experimental-5.3

 changelog                | 23 ++++++++++++++++++++++-
 control                  | 39 ++++++++++++++++++++++++++++++++-------
 control.gtk2.in          |  1 -
 control.transitionals.in | 14 ++++++++++++++
 rules                    |  5 +++--
 5 files changed, 71 insertions(+), 11 deletions(-)

diff --cc control
index 27dd4a1,c6089f5..4fbeec5
--- a/control
+++ b/control
@@@ -37,10 -37,10 +37,10 @@@ Build-Depends: ant (>= 1.7.0) [!mips64]
                 gperf,
                 java-common (>= 0.49),
                 javahelper (>= 0.37~),
-                junit4 (>= 4.8.2-2) [!hppa !ia64 !s390 !sparc !sparc64] <!nocheck>,
+                junit4 (>= 4.8.2-2) [!hppa !ia64 !s390 !sparc !kfreebsd-i386 !kfreebsd-amd64 !sparc64] <!nocheck>,
                 kdelibs5-dev (>= 4:4.3.4),
                 libabw-dev (>= 0.1),
 -               libarchive-zip-perl,
 +               libarchive-zip-perl [!mips64],
                 libavahi-client-dev,
                 libbluetooth-dev [linux-any],
                 libboost-date-time-dev (>= 1.58),

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