This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit eaee1a48431f58724bbc743477fe6cabad8a1462
Merge: bab1e24 2b5d378
Author: Rene Engelhard <r...@debian.org>
Date: Thu May 19 14:38:46 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
patches/liborcus-0.11.diff
patches/mdds-1.2.0.diff
source/include-binaries
changelog | 2 +-
rules | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --cc changelog
index 8c37421,1a55d99..91de45d
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,20 +1,11 @@@
-libreoffice (1:5.1.3-2) UNRELEASED; urgency=medium
-
- * debian/patches/mdds-1.2.0.diff: remove obsolete internal patches...
- * debian/patches/liborcus-0.11.diff: remove Mac OS and Windows-specific
- hunks which do not apply...
-
- * debian/rules:
- - move GTK3_MINVER setting down in rules so the conditional gets honoured
-
- * debian/source/include-binaries, tarballs/mdds-1.2.0.tar.bz2: add
- forgotten mdds-1.2.0.tar.bz2
-
- -- Rene Engelhard <r...@debian.org> Sat, 14 May 2016 00:18:49 +0200
-
-libreoffice (1:5.1.3-1) unstable; urgency=medium
+libreoffice (1:5.2.0~beta1~git20160513-1) UNRELEASED; urgency=medium
-
+ [ Mattia Rizzolo ]
+ * debian/control.in: use nowdays canonical URIs in Vcs-*
- * LibreOffice 5.1.3 final (identical to rc2)
+ [ Rene Engelhard ]
+ * New upstream snapshot
+ - fixes Impress slowing down with -gtk(3) and accessibility
+ (closes: #824035)
* debian/patches/kde4-cflags-no-usr-include.diff: don't set $kde_incdir
to /usr/include since -isystem /usr/include makes the stuff FTBFS
@@@ -24,8 -61,6 +23,9 @@@
- move hardcoded (!)kfreebsd-i386 (!)kfreebsd-amd64 to (!)kfreebsd-any.
Use linux-any instead of just disabling it for kfreebsd for
libbbluetooth-dev B-D; reflects the sense better
+ - fix another warning for !gcj builds: only try to set GCJ_JAWT_DIR if
+ GCJ_JAWT_DEPENDS is set
++ - move GTK3_MINVER setting down in rules so the conditional gets honoured
-- Rene Engelhard <r...@debian.org> Thu, 05 May 2016 22:46:40 +0200
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
