[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
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 abec9ae1738b1dd42baf41cad3d51313537c3926
Merge: 34a9a89 1a90a31
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 30 12:52:57 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
changelog | 17 ++++++++++++++---
patches/795131.diff | 23 +++++++++++++++++++++++
patches/series | 1 +
rules | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 87 insertions(+), 5 deletions(-)
diff --cc changelog
index e548475,8e2d22d..d519bab
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
- libreoffice (1:5.0.2~rc1~git20150828-1) UNRELEASED; urgency=medium
++libreoffice (1:5.0.2~rc1~git20150830-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Wed, 12 Aug 2015 15:23:58 +0200
+
- libreoffice (1:5.0.1-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.1-1) unstable; urgency=medium
* LibreOffice 5.0.1 final (identical to rc2)
diff --cc patches/series
index 8d6e17e,51d1d7c..9caea4f
--- a/patches/series
+++ b/patches/series
@@@ -30,3 -30,6 +30,4 @@@ gcj-no-bitness-check.dif
rsc-no-error-about-unknown-switch.diff
liborcus-0.9.1.diff
disable-tiledrendering-test.diff
-gtk3-rtl.diff
-kde4-rtl.diff
+ 795131.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: