[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 1c47c088de192ed6fe952bbbb1cb63333645f658
Merge: 6484bee c014e9d
Author: Rene Engelhard <rene@debian.org>
Date: Thu Mar 10 22:58:52 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
changelog | 28 ++++
control | 143 +--------------------
control.subsequentcheckbase.in | 2 +-
patches/disable-flaky-tests.diff | 35 +++++
rules | 28 ++--
tests/control | 2 +-
tests/control.in | 2 +-
tests/junit-subsequentcheck | 2 +-
tests/patches/java-subsequentcheck-standalone.diff | 12 +-
9 files changed, 84 insertions(+), 170 deletions(-)
diff --cc changelog
index f2b69f0,b3abeae..ace72fd
--- a/changelog
+++ b/changelog
@@@ -1,11 -1,31 +1,39 @@@
+libreoffice (1:5.1.2~rc1~git20160307-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - -sdbc-postgresql: use proper schema name for type names
+ (closes: #808125)
+
+ -- Rene Engelhard <rene@rene-engelhard.de> Thu, 26 Nov 2015 10:37:57 +0100
+
+ libreoffice (1:5.1.1-1) unstable; urgency=medium
+
+ * LibreOffice 5.1.1 final (identical to rc3)
+
+ * debian/patches/disable-flaky-tests.diff: (temporarily?) disable
+ testFlipAndRotateCustomShape per upstreams advice (closes: #815292)
+
+ * debian/rules:
+ - unset DISPLAY before running make check; some test(s) might fail
+ otherwise
+ * debian/rules, debian/test/*:
+ - stop adding -dbgsym to the test Depends:,
+ ci.debian.net doesn't have the debug archive in sources.list -> fail
+ - clean up: don't add %BUILD_DEPS_ARCH_ALL% to -subsequentcheckbases
+ Depends: as it doesn't really need it; the tests do, add in in
+ tests/control. Only depend on junit, ure, java-common in
+ -subsequentcheckbase. Add libreoffice{,-sdbc-hsqldb} dependencies in
+ tests/control.in
+ - run with verbose=t as the "normal" build
+
+ * merge from Ubuntu:
+ - update autopkgtest runner patch, removing unhelpful build system deps for
+ out-of-tree integration testing
+ - depend on libreoffice-sdbc-hsqldb for autopkgtests
+ - (re)add build version for "About LibreOffice"
+
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Mar 2016 20:31:50 +0100
+
libreoffice (1:5.1.1~rc3-1) unstable; urgency=medium
* New upstream release candidate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: