[libreoffice] 02/02: 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 d379c74a63d3eb183fef7530b0f1d53940727552
Merge: 6c5069e 1a90a31
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 30 12:56:23 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
changelog | 15 +++++++++++++--
rules | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 62 insertions(+), 4 deletions(-)
diff --cc changelog
index 819282c,8e2d22d..e1561b5
--- a/changelog
+++ b/changelog
@@@ -1,15 -1,4 +1,15 @@@
+libreoffice (1:5.1.0~alpha1~git20150828-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,eb} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control.lokit.in: suggest libgtk-3-dev instead of libgtk2.0-dev
+
+ -- Rene Engelhard <rene@debian.org> Mon, 01 Jun 2015 20:29:43 +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)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: