[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 df4a44e98a391282b514223fadd7b9ffb8848150
Merge: 7497bfa 3a17895
Author: Rene Engelhard <rene@debian.org>
Date: Wed Sep 23 15:16:21 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
changelog | 12 +++++++++++-
control | 15 ---------------
control.gtk3.in | 15 +++++++++++++++
control.in | 15 ---------------
rules | 27 +++++++++++----------------
5 files changed, 37 insertions(+), 47 deletions(-)
diff --cc changelog
index 821a097,4b5bda1..1ddfdc6
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,10 +1,16 @@@
+libreoffice (1:5.0.3~rc1~git20150917-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Thu, 17 Sep 2015 18:20:07 +0200
+
+ libreoffice (1:5.0.2-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - use dh_installdocs --link-doc=libreoffice-{core,common}
+
+ -- Rene Engelhard <rene@debian.org> Wed, 23 Sep 2015 13:45:25 +0200
+
libreoffice (1:5.0.2-1) unstable; urgency=medium
* New upstream release
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: