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 d5af9887f928aecc098901f5cae75bfd462ed00a Merge: 2c111b3 9421ca3 Author: Rene Engelhard <[email protected]> Date: Tue Jul 26 11:49:36 2016 +0200 Merge remote-tracking branch 'origin/master' into debian-experimental-5.1 Conflicts: changelog changelog | 8 +++++++- libreoffice-core.bug-script.in | 2 +- rules | 20 +++++++++----------- scripts/joinctrl.py | 14 +++++++------- ure.bug-script.in | 2 +- 5 files changed, 25 insertions(+), 21 deletions(-) diff --cc changelog index e31a57f,93b4b8a..5d49295 --- a/changelog +++ b/changelog @@@ -1,8 -1,9 +1,11 @@@ -libreoffice (1:5.1.5~rc1-2) UNRELEASED; urgency=medium +libreoffice (1:5.1.5~rc2~git20170726-1) UNRELEASED; urgency=medium + + * new upstream snapshot + * debian/patches/jre-update-gt-99.diff: backport from libreoffice-5-2; + allow java update version number > 99 + - -- Rene Engelhard <[email protected]> Mon, 25 Jul 2016 15:30:45 +0200 + -- Rene Engelhard <[email protected]> Tue, 26 Jul 2016 11:47:21 +0200 libreoffice (1:5.1.5~rc1-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
