[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-4.4
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit 891f8d56d28d57837d65153f9085eda1e12a51f1
Merge: 137a8e0 91a567f
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jun 30 18:30:29 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.4
Conflicts:
changelog
changelog | 12 ++++++++++++
control | 4 ++--
control.in | 2 +-
control.ure.in | 2 +-
rules | 8 ++++----
5 files changed, 20 insertions(+), 8 deletions(-)
diff --cc changelog
index d0d9821,a98c3f4..5b288b9
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,15 +1,21 @@@
+libreoffice (1:4.4.5~rc1~git20150614-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Sun, 14 Jun 2015 21:49:06 +0200
+
+ libreoffice (1:4.4.4-1) unstable; urgency=medium
+
+ * New upstream release
+
+ * debian/control.in:
+ - s/cliipart/clipart/ (closes: #787660 again)
+ * debian/rules:
+ - move libunoidllo.so from ure into uno-libs3, too, as
+ libcppuhelpergcc3.so.3 is (now) linked to it
+
+ -- Rene Engelhard <rene@debian.org> Sun, 28 Jun 2015 20:18:57 +0200
+
libreoffice (1:4.4.4~rc2-1) unstable; urgency=medium
* New upstream release candidate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: