This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.0 in repository libreoffice.
commit 34a9a898d103f9d7fecbf08905de1d1966bac823 Merge: fd994cc b769d03 Author: Rene Engelhard <r...@debian.org> Date: Fri Aug 28 14:08:01 2015 +0200 Merge remote-tracking branch 'origin/master' into debian-experimental-5.0 Conflicts: changelog patches/series changelog | 12 ++++++++++-- control | 4 ++-- patches/mysqlcppconn-libmysqlclient-SONAME.diff | 4 ++-- rules | 4 +++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --cc changelog index 013976e,c08df93..e548475 --- a/changelog +++ b/changelog @@@ -1,10 -1,11 +1,17 @@@ - libreoffice (1:5.0.2~rc1~git20150826-1) UNRELEASED; urgency=medium ++libreoffice (1:5.0.2~rc1~git20150828-1) UNRELEASED; urgency=medium + + * New upstream snapshot + + -- Rene Engelhard <r...@debian.org> Wed, 12 Aug 2015 15:23:58 +0200 + - libreoffice (1:5.0.1~rc2-2) UNRELEASED; urgency=medium + libreoffice (1:5.0.1-1) UNRELEASED; urgency=medium + + * LibreOffice 5.0.1 final (identical to rc2) + + * debian/patches/mysqlcppconn-libmysqlclient-SONAME.diff: update; fix internal + mysqlcppconn build + * debian/patches/kde4-rtl.diff: KDE4: fix RTL scrollbar handling, from + libreoffice-5-0 * debian/rules: - two more s/src/tarballs/ I forgot -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git