[libreoffice] 02/02: Merge remote-tracking branch 'origin/debian-experimental-4.4' into debian-experimental-4.5
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.5
in repository libreoffice.
commit 97ca81f13cdb9a2ac53296b3720b3ee246e5f35d
Merge: 25d8323 3178de9
Author: Rene Engelhard <rene@debian.org>
Date: Sun Mar 15 21:37:44 2015 +0100
Merge remote-tracking branch 'origin/debian-experimental-4.4' into debian-experimental-4.5
Conflicts:
changelog
changelog | 11 +++++++++++
control | 2 +-
control.ogltrans.in | 2 +-
rules | 4 ++--
4 files changed, 15 insertions(+), 4 deletions(-)
diff --cc changelog
index 2cace68,5131080..6044fd4
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,14 +1,23 @@@
+libreoffice (1:4.5.0~alpha1~git20150228-1) UNRELEASED; urgency=medium
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - adapt for ure folded into /usr/lib/libreoffice/program directly
+
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Dec 2014 21:56:42 +0100
+
+ libreoffice (1:4.4.2~rc1-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/control.ogltrans.in:
+ - capitalize "impress" in description (closes: #779479)
+ * debian/rules:
+ - fix logic to not install sound files (closes: #780497)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 15 Mar 2015 09:42:20 +0100
+
libreoffice (1:4.4.1~rc2-1) experimental; 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: