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 e5097462d575ef58c07e5d7c96d5313a8a4061d8
Merge: eebd634 1df6f5e
Author: Rene Engelhard <r...@debian.org>
Date: Mon Mar 14 19:00:14 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
bug-presubj | 19 ++++++++++---------
changelog | 15 +++++++++++++++
rules | 63 +++++++++++++++++++++++++++++++++----------------------------
3 files changed, 59 insertions(+), 38 deletions(-)
diff --cc changelog
index 26d9776,90827b7..e5ed275
--- a/changelog
+++ b/changelog
@@@ -1,11 -1,18 +1,26 @@@
+libreoffice (1:5.1.2~rc1~git20160314-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - -sdbc-postgresql: use proper schema name for type names
+ (closes: #808125)
+
+ -- Rene Engelhard <r...@rene-engelhard.de> Thu, 26 Nov 2015 10:37:57 +0100
+
+ libreoffice (1:5.1.1-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - decouple BUILD_TEST_PACKAGE and BUILD_DDEBS/BUILD_DBG_PACKAGE,
+ as the tests con't depend on -dbg/-dbgsym anymore (and it fixes
+ -dbg building for jessie-backports). Fix some order: add a if and
+ remove --no-ddeb on jessie (not existing) to make -dbg package building
+ actually work again
+ - use internal libwps for jessie-backports
+ - don't hardcode python3-six in -dbgsyms Recommends
+ * debian/bug-presubj: point to TDF-bugzilla and LOs BT/strace instructions;
+ minor wording fixes
+
+ -- Rene Engelhard <r...@debian.org> Sun, 13 Mar 2016 21:18:55 +0100
+
libreoffice (1:5.1.1-1) unstable; urgency=medium
* LibreOffice 5.1.1 final (identical to rc3)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
