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 8c50ec3d73b026c744d0ddd1d99b16d0ac64c663
Merge: c010b6c 7e03cea
Author: Rene Engelhard <r...@debian.org>
Date: Mon Aug 15 19:30:52 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.2' into
debian-experimental-5.3
control | 12 ++++++------
control.systray.in | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --cc control
index 4788066,d73dd03..b734b43
--- 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 !kfreebsd-i386
!kfreebsd-amd64 !sparc64] <!nocheck>,
+ junit4 (>= 4.8.2-2) [!hppa !ia64 !kfreebsd-amd64
!kfreebsd-i386 !s390 !sparc !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
