[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 26c1235088103e5631d9044ee75bdd4254cff1ad
Merge: 0f80a39 6161ff8
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 5 20:44:17 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
changelog | 3 +++
control | 2 +-
control.in | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --cc changelog
index 1cc4e8d,24ebada..699516c
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,11 +1,25 @@@
-libreoffice (1:4.4.3-1) unstable; urgency=medium
+libreoffice (1:5.0.0~beta1~git20150502-1) UNRELEASED; urgency=medium
- * New upstream release
+ * New upstream snapshot
+ - add conditional for system-collada2gltf
+ * merge from Ubuntu:
+ - add missing Replaces: (LP: #1443667)
+
- -- Rene Engelhard <rene@debian.org> Mon, 04 May 2015 12:23:05 +0200
+ -- Rene Engelhard <rene@rene-engelhard.de> Tue, 21 Apr 2015 20:07:24 +0200
+
+libreoffice (1:5.0.0~alpha1-1) experimental; urgency=medium
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - adapt for ure folded into /usr/lib/libreoffice/program directly
+ - build only en-US for now
+ * debian/uno-libs3.symbols: update
+ * debian/control.in, debian/rules: disable crystal icons (KDE3); enable
+ breeze (KDE 5)
+
+ -- Rene Engelhard <rene@debian.org> Tue, 21 Apr 2015 21:30:13 +0200
libreoffice (1:4.4.2-1) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: